diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-05-29 22:20:40 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-05-29 22:20:40 +0300 |
| commit | ff575b782e53e42a85ebfe65a559864f45c848b1 (patch) | |
| tree | 4b5deca3a45b26214cf29682ecdb900de8531a83 /lib | |
| parent | 4aae86f6f71ab381de1d987a04d5e9c250cd2080 (diff) | |
| parent | 9471c3f673abab7b3179c1dc2931a2c44aa1f3a2 (diff) | |
Merge branch '6045-extract-ee-specific-specs-lines' into 'master'
[CE] Resolve "Extract EE specific files/lines for some controller specs"
Closes #6045
See merge request gitlab-org/gitlab-ce!19089
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 |