diff options
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 39dec5223df..8895cb955bd 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -542,12 +542,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController end def compared_diff_version - compare = @merge_request_diff.compare_with(@start_sha) - - if compare - @diffs = compare.diffs(diff_options) - @diff_notes_disabled = true - end + @diff_notes_disabled = true + @diffs = @merge_request_diff.compare_with(@start_sha).diffs(diff_options) end def original_diff_version |