diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-05-25 19:26:55 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-05-25 19:26:55 +0300 |
| commit | 10a914fbf31b465ac2190730b826f7752ece7da4 (patch) | |
| tree | 1c02aa995de8ed24bce41d6fcd461c7f92a8f83c /app/models/merge_request_diff.rb | |
| parent | 5d5b97cdd692802fc38a12d958a67d73686b97ab (diff) | |
| parent | d70f7f5d25aa8753ee3fa26a7564b7d379e72c2d (diff) | |
| download | gitlab-ce-dz-codeclimate-compare.tar.gz | |
Merge remote-tracking branch 'origin/master' into dz-codeclimate-comparedz-codeclimate-compare
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/models/merge_request_diff.rb')
| -rw-r--r-- | app/models/merge_request_diff.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index f0a3c30ea74..6e3917a10a3 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -175,12 +175,11 @@ class MergeRequestDiff < ActiveRecord::Base self == merge_request.merge_request_diff end - def compare_with(sha, straight: true) + def compare_with(sha) # When compare merge request versions we want diff A..B instead of A...B # so we handle cases when user does squash and rebase of the commits between versions. # For this reason we set straight to true by default. - CompareService.new(project, head_commit_sha) - .execute(project, sha, straight: straight) + CompareService.new(project, head_commit_sha).execute(project, sha, straight: true) end def commits_count |