summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-10-23 18:03:57 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-10-23 18:03:57 +0000
commit11a57e4f29d353612dd1422583bceb365000fe50 (patch)
tree18ae4ddf854b4d10aae2631d2b2a289e2afb7ac9
parentd25a8ed076aea797ad71cbfaf895cfab190bfcfd (diff)
parent7dc70e0d67607987cb2727869c95be3ce2428017 (diff)
downloadgitlab-ce-11a57e4f29d353612dd1422583bceb365000fe50.tar.gz
Merge branch '53030-ee-compat-check-frozen-literal' into 'master'test-review-root-password
Fix ee-compat-check by not modifying frozen strings Closes #53030 See merge request gitlab-org/gitlab-ce!22527
-rw-r--r--lib/gitlab/ee_compat_check.rb10
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/gitlab/ee_compat_check.rb b/lib/gitlab/ee_compat_check.rb
index 6fc86925f81..5d9ecd651a0 100644
--- a/lib/gitlab/ee_compat_check.rb
+++ b/lib/gitlab/ee_compat_check.rb
@@ -286,7 +286,7 @@ module Gitlab
end
def patch_name_from_branch(branch_name)
- branch_name.parameterize << '.patch'
+ "#{branch_name.parameterize}.patch"
end
def patch_url
@@ -434,9 +434,11 @@ module Gitlab
end
def conflicting_files_msg
- failed_files.reduce("The conflicts detected were as follows:\n") do |memo, file|
- memo << "\n - #{file}"
- end
+ header = "The conflicts detected were as follows:\n"
+ separator = "\n - "
+ failed_items = failed_files.join(separator)
+
+ "#{header}#{separator}#{failed_items}"
end
end
end