diff options
author | Jacob Vosmaer <jacob@gitlab.com> | 2018-03-02 10:32:13 +0100 |
---|---|---|
committer | Jacob Vosmaer <jacob@gitlab.com> | 2018-03-08 12:50:42 +0100 |
commit | f45c66e5b0618152db05c0856878851d1e97fa60 (patch) | |
tree | 6e2f46d923abc510e7c9d0f810da9838cd836ae7 | |
parent | 0f26f9681faf2d49949f52227d6f4bd90c1b6e93 (diff) | |
download | gitlab-ce-f45c66e5b0618152db05c0856878851d1e97fa60.tar.gz |
Remove duplicate method definitions
-rw-r--r-- | lib/gitlab/git/repository.rb | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index d4f6b543daf..656f3999756 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -1433,16 +1433,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_for_path(sha, path) gitaly_migrate(:last_commit_for_path) do |is_enabled| if is_enabled @@ -2404,14 +2394,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 |