diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-09-29 17:46:47 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-10-12 16:32:57 +0300 |
| commit | cdcc11d48fe6d04f6a1cfebc39bcea71d35b3e4a (patch) | |
| tree | d263e3fee42c7347c2a4d29e9481da8107bdb760 /app/models/merge_request_diff.rb | |
| parent | afe28b7be3a3a5a9db6e5a32465c0e3a8e9cb83d (diff) | |
| download | gitlab-ce-cdcc11d48fe6d04f6a1cfebc39bcea71d35b3e4a.tar.gz | |
Improve tests for merge request diff model
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index 0ea9e892be2..6ad2201573d 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -169,7 +169,7 @@ class MergeRequestDiff < ActiveRecord::Base def compare_with(sha, straight = true) # When compare merge request versions we want diff A..B instead of A...B - # so we handle cases when user squash and rebase commits in one of versions. + # 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.execute(project, head_commit_sha, project, sha, straight) end |