diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2018-07-12 18:06:31 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2018-07-12 18:06:31 +0200 |
| commit | 9d93a61a70f5f5af12a880e0ca7f4ec6575152f9 (patch) | |
| tree | 722a8beb48111b6f0eaab7ee103c9d06f6536917 /lib | |
| parent | 40ed88b78412c9598293dbc3b12e3d7c65e12c23 (diff) | |
| download | gitlab-ce-9d93a61a70f5f5af12a880e0ca7f4ec6575152f9.tar.gz | |
Fix find_branch call sitesgitaly-mandatory-20180712-jv
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/git/repository.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index d4dcfd47d0c..fc4711751b1 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -1114,7 +1114,7 @@ module Gitlab end def can_be_merged?(source_sha, target_branch) - if target_sha = find_branch(target_branch, true)&.target + if target_sha = find_branch(target_branch)&.target !gitaly_conflicts_client(source_sha, target_sha).conflicts? else false |