Merge branch 'use-rugged-for-merge' into 'master'

Merge branches inside one repository using rugged instead of satellites

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

cc @rspeicher @DouweM

See merge request !918

2 files changed, 16 insertions, 3 deletions

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 7ecdaf6b2e0..040ab0f4b0f 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -205,7 +205,20 @@ class MergeRequest < ActiveRecord::Base
   end
 
   def check_if_can_be_merged
-    if Gitlab::Satellite::MergeAction.new(self.author, self).can_be_merged?
+    can_be_merged =
+      if for_fork?
+        Gitlab::Satellite::MergeAction.new(self.author, self).can_be_merged?
+      else
+        rugged = project.repository.rugged
+        our_commit = rugged.branches[target_branch].target
+        their_commit = rugged.branches[source_branch].target
+
+        if our_commit && their_commit
+          !rugged.merge_commits(our_commit, their_commit).conflicts?
+        end
+      end
+
+    if can_be_merged
       mark_as_mergeable
     else
       mark_as_unmergeable
diff --git a/app/models/repository.rb b/app/models/repository.rb
index cab3e896159..97d2aa1c89e 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -414,8 +414,6 @@ class Repository
     Gitlab::Git::Blob.remove(raw_repository, options)
   end
 
-  private
-
   def user_to_comitter(user)
     {
       email: user.email,
@@ -424,6 +422,8 @@ class Repository
     }
   end
 
+  private
+
   def cache
     @cache ||= RepositoryCache.new(path_with_namespace)
   end