summaryrefslogtreecommitdiff
path: root/app/models/commit.rb
diff options
context:
space:
mode:
authorgfyoung <gfyoung17@gmail.com>2018-07-25 02:30:33 -0700
committergfyoung <gfyoung17@gmail.com>2018-07-26 16:55:41 -0700
commit50abbd3e53d4f5e3e67543650a13aca9a54b37c2 (patch)
tree4b36ec83d974102ab38738b05678e3f0f738a6f3 /app/models/commit.rb
parentcaeb4597a5b24e0eaa96b24901ce9208c2eef4bf (diff)
downloadgitlab-ce-50abbd3e53d4f5e3e67543650a13aca9a54b37c2.tar.gz
Enable frozen string in app/models/*.rbrepo-forks/gitlab-ce-frozen-string-enable-app-models
Partially addresses #47424.
Diffstat (limited to 'app/models/commit.rb')
-rw-r--r--app/models/commit.rb10
1 files changed, 6 insertions, 4 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb
index 56d4c86774e..8b9f4490ffa 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -1,4 +1,6 @@
# coding: utf-8
+# frozen_string_literal: true
+
class Commit
extend ActiveModel::Naming
extend Gitlab::Cache::RequestCache
@@ -339,21 +341,21 @@ class Commit
end
def cherry_pick_description(user)
- message_body = "(cherry picked from commit #{sha})"
+ message_body = ["(cherry picked from commit #{sha})"]
if merged_merge_request?(user)
commits_in_merge_request = merged_merge_request(user).commits
if commits_in_merge_request.present?
- message_body << "\n"
+ message_body << ""
commits_in_merge_request.reverse.each do |commit_in_merge|
- message_body << "\n#{commit_in_merge.short_id} #{commit_in_merge.title}"
+ message_body << "#{commit_in_merge.short_id} #{commit_in_merge.title}"
end
end
end
- message_body
+ message_body.join("\n")
end
def cherry_pick_message(user)