Merge branch 'lib-gitlab-git-ee-diff' into 'master'

Remove lib/gitlab/git EE diff

Closes #6525

See merge request gitlab-org/gitlab-ee!6221

ee/app/models/ee/repository.rb

@@ -35,5 +35,12 @@ module EE
       # Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/1243
       ::Gitlab::GitalyClient::StorageSettings.allow_disk_access { super }
     end
+
+    # Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/1246
+    def update_branch(user, branch_name, newrev, oldrev)
+      ::Gitlab::GitalyClient::StorageSettings.allow_disk_access do
+        ::Gitlab::Git::OperationService.new(user, raw_repository).update_branch(branch_name, newrev, oldrev)
+      end
+    end
   end
 end

lib/gitlab/git/repository.rb

@@ -925,10 +925,6 @@ module Gitlab
         nil
       end
 
-      def update_branch(user, branch_name, newrev, oldrev)
-        Gitlab::Git::OperationService.new(user, self).update_branch(branch_name, newrev, oldrev)
-      end
-
       AUTOCRLF_VALUES = {
         "true" => true,
         "false" => false,
@@ -2243,14 +2239,6 @@ module Gitlab
           .map { |c| commit(c) }
       end
 
-      def gitaly_can_be_merged?(their_commit, our_commit)
-        !gitaly_conflicts_client(our_commit, their_commit).conflicts?
-      end
-
-      def rugged_can_be_merged?(their_commit, our_commit)
-        !rugged.merge_commits(our_commit, their_commit).conflicts?
-      end
-
       def last_commit_for_path_by_gitaly(sha, path)
         gitaly_commit_client.last_commit_for_path(sha, path)
       end