From ff1e0ecfc6344c9609da8d5775486419872b8922 Mon Sep 17 00:00:00 2001
From: Robert Speicher <robert@gitlab.com>
Date: Thu, 28 Jan 2016 21:08:41 +0000
Subject: 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
---
 app/models/project.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'app/models/project.rb')

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
-- 
cgit v1.2.1