diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-08-08 13:24:45 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-08-09 16:49:44 +0200 |
| commit | 04c328f923afdc4143b875b888235e563b540d90 (patch) | |
| tree | 528e6b4113cdf1acd5cafccbbe239d57c9bd7954 | |
| parent | c946ee1282655d332da4ba99c448d6f68cf87cee (diff) | |
| download | gitlab-ce-04c328f923afdc4143b875b888235e563b540d90.tar.gz | |
Fix ee_compat_check when EE branch uses a prefix
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | lib/gitlab/ee_compat_check.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/gitlab/ee_compat_check.rb b/lib/gitlab/ee_compat_check.rb index 72d7d4f84d1..abd401224d8 100644 --- a/lib/gitlab/ee_compat_check.rb +++ b/lib/gitlab/ee_compat_check.rb @@ -98,10 +98,11 @@ module Gitlab if status.zero? @ee_branch_found = ee_branch_prefix - else - _, status = step("Fetching origin/#{ee_branch_suffix}", %W[git fetch origin #{ee_branch_suffix}]) + return end + _, status = step("Fetching origin/#{ee_branch_suffix}", %W[git fetch origin #{ee_branch_suffix}]) + if status.zero? @ee_branch_found = ee_branch_suffix else |