diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-08 13:21:53 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-08 13:21:53 +0000 |
commit | cb1538bba7afac965f6ba2b09e8b94afdcdd7fbc (patch) | |
tree | 3f4a6c547f544465ba7df11d7457ee36d0188e4b | |
parent | aec3e1ddf7533334f5c1177721acbeb619abcaf2 (diff) | |
parent | f45c66e5b0618152db05c0856878851d1e97fa60 (diff) | |
download | gitlab-ce-cb1538bba7afac965f6ba2b09e8b94afdcdd7fbc.tar.gz |
Merge branch 'gitlab-git-duplicate-code' into 'master'
Remove duplicate method definitions
See merge request gitlab-org/gitlab-ce!17478
-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 |