diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-09-07 10:22:07 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-09-07 10:24:48 +0300 |
| commit | d41fc61fb45964810a98e38bd34c9a04f0a11ed8 (patch) | |
| tree | 252e275e68e427b588cb9151c74a96964e367e38 | |
| parent | 6f7a3ee69457c89d8b774fd65bdc4da756cc27c3 (diff) | |
| download | gitlab-ce-dz-mr-version-compare.tar.gz | |
Refactor compared_diff_version method in merge requests controllerdz-mr-version-compare
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -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 |