summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMario de la Ossa <mariodelaossa@gmail.com>2018-10-22 19:15:07 -0600
committerMario de la Ossa <mariodelaossa@gmail.com>2018-10-23 09:15:17 -0600
commit7dc70e0d67607987cb2727869c95be3ce2428017 (patch)
treed68becc8af1c884726fdb88168323ac59d564d6e
parent4cf1845e7ea5d9a52fe5af49dd1644f98a921010 (diff)
downloadgitlab-ce-7dc70e0d67607987cb2727869c95be3ce2428017.tar.gz
Fix ee-compat-check by not modifying frozen strings53030-ee-compat-check-frozen-literal
-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