kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Sean McGivern 2017-03-28 10:06:03 +00:00
parent 19a4403443 1dbd80d190
commit ad831ace7e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/gitlab/ee_compat_check.rb
View File

@ -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