diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-01-28 21:08:41 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-01-31 19:26:59 -0500 |
| commit | ff1e0ecfc6344c9609da8d5775486419872b8922 (patch) | |
| tree | 9c95be25efb5a6d6e43952250b862fcf3cfca69c /app/models/project.rb | |
| parent | 3d687ec3162601d5c49e66cac8eaf0af024ea8d5 (diff) | |
| download | gitlab-ce-ff1e0ecfc6344c9609da8d5775486419872b8922.tar.gz | |
Merge branch 'mr-merge-base' into 'master'
Correctly determine MR diff base when MR has merge conflicts
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12779
See merge request !2632
Diffstat (limited to 'app/models/project.rb')
| -rw-r--r-- | app/models/project.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index cb668e0c2f7..9cd2b1af282 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -344,6 +344,11 @@ class Project < ActiveRecord::Base repository.commit(id) end + def merge_base_commit(first_commit_id, second_commit_id) + sha = repository.merge_base(first_commit_id, second_commit_id) + repository.commit(sha) if sha + end + def saved? id && persisted? end |