diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-28 10:06:03 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-28 10:06:03 +0000 |
| commit | ad831ace7ed8d2ed999b15f8350aaa51f0490124 (patch) | |
| tree | 1d6dab462e967374d48f8254053e4601218e5684 /lib | |
| parent | 19a4403443ff6217e6a024667f8ef1eea2f38f4a (diff) | |
| parent | 1dbd80d190425120b4fcff48b390121c5a91e902 (diff) | |
| download | gitlab-ce-ad831ace7ed8d2ed999b15f8350aaa51f0490124.tar.gz | |
Merge branch 'fix-ee_compat_check' into 'master'
Fix Gitlab::EeCompatCheck: use `ee_branch_found` instead of `ee_branch`
Closes #30136
See merge request !10255
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 0829c1c318e..496ee0bdcb0 100644 --- a/lib/gitlab/ee_compat_check.rb +++ b/lib/gitlab/ee_compat_check.rb @@ -125,7 +125,7 @@ module Gitlab end puts - puts applies_cleanly_msg(ee_branch) + puts applies_cleanly_msg(ee_branch_found) end def check_patch(patch_path) @@ -215,7 +215,7 @@ module Gitlab end def ee_patch_name - @ee_patch_name ||= patch_name_from_branch(ee_branch) + @ee_patch_name ||= patch_name_from_branch(ee_branch_found) end def ee_patch_full_path |