diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-05-21 15:38:33 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-05-23 16:27:30 -0500 |
| commit | ab91f76e8b275d0fc1d78b38b95d4b2cd8e73bdb (patch) | |
| tree | e22910b5a3fc8dee98c5d674ee030b46421a4727 /app/models/merge_request_diff.rb | |
| parent | 52527be4387cb978402a330f2e4de96e586a62db (diff) | |
| download | gitlab-ce-ab91f76e8b275d0fc1d78b38b95d4b2cd8e73bdb.tar.gz | |
Add system note with link to diff comparison when MR discussion becomes outdated
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 |