Commit 11a57e4f authored by Sean McGivern's avatar Sean McGivern

Merge branch '53030-ee-compat-check-frozen-literal' into 'master'

Fix ee-compat-check by not modifying frozen strings

Closes #53030

See merge request gitlab-org/gitlab-ce!22527
parents d25a8ed0 7dc70e0d
...@@ -286,7 +286,7 @@ module Gitlab ...@@ -286,7 +286,7 @@ module Gitlab
end end
def patch_name_from_branch(branch_name) def patch_name_from_branch(branch_name)
branch_name.parameterize << '.patch' "#{branch_name.parameterize}.patch"
end end
def patch_url def patch_url
...@@ -434,9 +434,11 @@ module Gitlab ...@@ -434,9 +434,11 @@ module Gitlab
end end
def conflicting_files_msg def conflicting_files_msg
failed_files.reduce("The conflicts detected were as follows:\n") do |memo, file| header = "The conflicts detected were as follows:\n"
memo << "\n - #{file}" separator = "\n - "
end failed_items = failed_files.join(separator)
"#{header}#{separator}#{failed_items}"
end end
end end
end end
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