Commit 9471c3f6 authored by Rémy Coutable's avatar Rémy Coutable

Try to fetch the CE branch in EE because sometimes it has the same name

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 7736b518
...@@ -138,8 +138,8 @@ module Gitlab ...@@ -138,8 +138,8 @@ module Gitlab
def ee_branch_presence_check! def ee_branch_presence_check!
ee_remotes.keys.each do |remote| ee_remotes.keys.each do |remote|
[ee_branch_prefix, ee_branch_suffix].each do |branch| [ce_branch, ee_branch_prefix, ee_branch_suffix].each do |branch|
_, status = step("Fetching #{remote}/#{ee_branch_prefix}", %W[git fetch #{remote} #{branch}]) _, status = step("Fetching #{remote}/#{branch}", %W[git fetch #{remote} #{branch}])
if status.zero? if status.zero?
@ee_remote_with_branch = remote @ee_remote_with_branch = remote
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment