From 1ee340f888492e044caa994f33fd59ebd3459aab Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Fri, 2 Mar 2018 10:32:13 +0100 Subject: Remove duplicate method definitions --- lib/gitlab/git/repository.rb | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'lib') diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index 1c964960983..2247e35fbeb 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -1420,16 +1420,6 @@ module Gitlab output end - def can_be_merged?(source_sha, target_branch) - gitaly_migrate(:can_be_merged) do |is_enabled| - if is_enabled - gitaly_can_be_merged?(source_sha, find_branch(target_branch).target) - else - rugged_can_be_merged?(source_sha, target_branch) - end - end - end - def last_commit_id_for_path(sha, path) gitaly_migrate(:last_commit_for_path) do |is_enabled| if is_enabled @@ -2391,14 +2381,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 -- cgit v1.2.1