diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-05-24 13:02:41 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-05-24 20:29:31 +0300 |
| commit | 9471c3f673abab7b3179c1dc2931a2c44aa1f3a2 (patch) | |
| tree | c51f59eec58dbc76f72734fcf330600023375d9b /lib | |
| parent | 7736b518121f853b44732b851034e8cfca910e15 (diff) | |
Try to fetch the CE branch in EE because sometimes it has the same name
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ee_compat_check.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/ee_compat_check.rb b/lib/gitlab/ee_compat_check.rb index 8cf59fa8e28..8c72d00c1f3 100644 --- a/lib/gitlab/ee_compat_check.rb +++ b/lib/gitlab/ee_compat_check.rb @@ -138,8 +138,8 @@ module Gitlab def ee_branch_presence_check! ee_remotes.keys.each do |remote| - [ee_branch_prefix, ee_branch_suffix].each do |branch| - _, status = step("Fetching #{remote}/#{ee_branch_prefix}", %W[git fetch #{remote} #{branch}]) + [ce_branch, ee_branch_prefix, ee_branch_suffix].each do |branch| + _, status = step("Fetching #{remote}/#{branch}", %W[git fetch #{remote} #{branch}]) if status.zero? @ee_remote_with_branch = remote |