diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
| commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
| tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/models/diff_note.rb | |
| parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) | |
| download | gitlab-ce-8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'app/models/diff_note.rb')
| -rw-r--r-- | app/models/diff_note.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/diff_note.rb b/app/models/diff_note.rb index ff39dbb59f3..4b2e62bf761 100644 --- a/app/models/diff_note.rb +++ b/app/models/diff_note.rb @@ -136,7 +136,7 @@ class DiffNote < Note # As an extra benefit, the returned `diff_file` already # has `highlighted_diff_lines` data set from Redis on # `Diff::FileCollection::MergeRequestDiff`. - file = noteable.diffs(original_position.diff_options).diff_files.first + file = original_position.find_diff_file_from(noteable) # if line is not found in persisted diffs, fallback and retrieve file from repository using gitaly # This is required because of https://gitlab.com/gitlab-org/gitlab/issues/42676 file = nil if file&.line_for_position(original_position).nil? && importing? |