diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-11-08 08:51:30 +0000 |
|---|---|---|
| committer | Steve Azzopardi <steveazz@outlook.com> | 2018-11-08 13:34:53 +0100 |
| commit | 178e47500120b93d1607a667ab94fa337b990037 (patch) | |
| tree | 216d2c6d16c4522337a45738fa3da64fbb8c0c0e /app/controllers/projects | |
| parent | 1d3892b9e7949e6fea7af8219d115385ff50e72a (diff) | |
| download | gitlab-ce-178e47500120b93d1607a667ab94fa337b990037.tar.gz | |
Merge branch 'osw-revert-comment-in-any-diff-line' into 'master'
Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'"
See merge request gitlab-org/gitlab-ce!22891
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/blob_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/projects/merge_requests/diffs_controller.rb | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 2a6fe3b9c97..c02ec407262 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -122,7 +122,7 @@ class Projects::BlobController < Projects::ApplicationController @lines.map! do |line| # These are marked as context lines but are loaded from blobs. # We also have context lines loaded from diffs in other places. - diff_line = Gitlab::Diff::Line.new(line, nil, nil, nil, nil) + diff_line = Gitlab::Diff::Line.new(line, 'context', nil, nil, nil) diff_line.rich_text = line diff_line end diff --git a/app/controllers/projects/merge_requests/diffs_controller.rb b/app/controllers/projects/merge_requests/diffs_controller.rb index 740f41c0642..5307cd0720a 100644 --- a/app/controllers/projects/merge_requests/diffs_controller.rb +++ b/app/controllers/projects/merge_requests/diffs_controller.rb @@ -22,12 +22,6 @@ class Projects::MergeRequests::DiffsController < Projects::MergeRequests::Applic def render_diffs @environment = @merge_request.environments_for(current_user).last - notes_grouped_by_path = @notes.group_by { |note| note.position.file_path } - - @diffs.diff_files.each do |diff_file| - notes = notes_grouped_by_path.fetch(diff_file.file_path, []) - notes.each { |note| diff_file.unfold_diff_lines(note.position) } - end @diffs.write_cache |