diff options
Diffstat (limited to 'app/controllers/projects/merge_requests/diffs_controller.rb')
| -rw-r--r-- | app/controllers/projects/merge_requests/diffs_controller.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests/diffs_controller.rb b/app/controllers/projects/merge_requests/diffs_controller.rb index 5307cd0720a..0d9a991d21e 100644 --- a/app/controllers/projects/merge_requests/diffs_controller.rb +++ b/app/controllers/projects/merge_requests/diffs_controller.rb @@ -22,8 +22,13 @@ class Projects::MergeRequests::DiffsController < Projects::MergeRequests::Applic def render_diffs @environment = @merge_request.environments_for(current_user).last + notes_grouped_by_old_path = @notes.group_by { |note| note.position.old_path } - @diffs.write_cache + # @diffs.write_cache + @diffs.diff_files.each do |diff_file| + notes = notes_grouped_by_old_path.fetch(diff_file.old_path, []) + notes.each { |note| diff_file.unfold_diff_lines(note.position) } + end request = { current_user: current_user, |