diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-11-22 21:43:27 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-11-22 21:43:27 +0000 |
| commit | f15c3421c59d5533c56c225956d45f9c5fe312b9 (patch) | |
| tree | 252f59fa645eda0658abed034f4c380c40f1bb4c | |
| parent | c2840e70dca0ca46259bf5362526d7040bf6c57c (diff) | |
| download | gitlab-ce-rc/27742-display-member-role-per-project.tar.gz | |
Try to always find the merge base using `origin/#{branch}` instead of just `#{branch}`rc/27742-display-member-role-per-project
| -rw-r--r-- | lib/gitlab/ee_compat_check.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/ee_compat_check.rb b/lib/gitlab/ee_compat_check.rb index 3a6165f504c..ac730278ca7 100644 --- a/lib/gitlab/ee_compat_check.rb +++ b/lib/gitlab/ee_compat_check.rb @@ -182,7 +182,7 @@ module Gitlab def merge_base_found?(master_remote:, branch:) step( "Finding merge base with #{master_remote}/master", - %W[git merge-base #{master_remote}/master #{branch}] + %W[git merge-base #{master_remote}/master origin/#{branch}] ) do |output, status| if status.zero? puts "Merge base was found: #{output}" |