Commit 6f7ce372 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'fix-ee_compat_check-when-branch-contains-a-slash' into 'master'

Ensure we sanitize branch names with path-unfriendly characters

See merge request !7696
parents d7eeb6df cd78e020
......@@ -149,7 +149,7 @@ module Gitlab
end
def ce_patch_name
@ce_patch_name ||= "#{ce_branch}.patch"
@ce_patch_name ||= patch_name_from_branch(ce_branch)
end
def ce_patch_full_path
......@@ -161,13 +161,17 @@ module Gitlab
end
def ee_patch_name
@ee_patch_name ||= "#{ee_branch}.patch"
@ee_patch_name ||= patch_name_from_branch(ee_branch)
end
def ee_patch_full_path
@ee_patch_full_path ||= patches_dir.join(ee_patch_name)
end
def patch_name_from_branch(branch_name)
branch_name.parameterize << '.patch'
end
def step(desc, cmd = nil)
puts "\n=> #{desc}\n"
......
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