diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-10 00:06:24 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-10 00:06:24 +0300 |
| commit | 4b28d5ae770c6bd332283a3f13ceae06329c409b (patch) | |
| tree | ae4d46e1d017002935fe75dc14cb3c108be12fae /app/models/merge_request_diff_file.rb | |
| parent | 41efffa17c67405ca5f5dac49d72be7872cee339 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/merge_request_diff_file.rb')
| -rw-r--r-- | app/models/merge_request_diff_file.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/merge_request_diff_file.rb b/app/models/merge_request_diff_file.rb index a532c1e6356..14c86ec69da 100644 --- a/app/models/merge_request_diff_file.rb +++ b/app/models/merge_request_diff_file.rb @@ -5,6 +5,7 @@ class MergeRequestDiffFile < ApplicationRecord include DiffFile belongs_to :merge_request_diff, inverse_of: :merge_request_diff_files + alias_attribute :index, :relative_order def utf8_diff return '' if diff.blank? |