diff options
Diffstat (limited to 'app/controllers/projects/merge_requests_controller.rb')
| -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 b86915e8470..39dec5223df 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -542,7 +542,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController end def compared_diff_version - compare = CompareService.new.execute(@project, @merge_request_diff.head_commit_sha, @project, @start_sha) + compare = @merge_request_diff.compare_with(@start_sha) if compare @diffs = compare.diffs(diff_options) @@ -551,11 +551,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController end def original_diff_version - unless @merge_request_diff.latest? - # Disable comments if browsing older version of the diff - @diff_notes_disabled = true - end - + @diff_notes_disabled = !@merge_request_diff.latest? @diffs = @merge_request_diff.diffs(diff_options) end end |