Commit ad831ace authored by Sean McGivern's avatar Sean McGivern

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
parents 19a44034 1dbd80d1
...@@ -125,7 +125,7 @@ module Gitlab ...@@ -125,7 +125,7 @@ module Gitlab
end end
puts puts
puts applies_cleanly_msg(ee_branch) puts applies_cleanly_msg(ee_branch_found)
end end
def check_patch(patch_path) def check_patch(patch_path)
...@@ -215,7 +215,7 @@ module Gitlab ...@@ -215,7 +215,7 @@ module Gitlab
end end
def ee_patch_name def ee_patch_name
@ee_patch_name ||= patch_name_from_branch(ee_branch) @ee_patch_name ||= patch_name_from_branch(ee_branch_found)
end end
def ee_patch_full_path def ee_patch_full_path
......
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