diff --git a/app/models/commit.rb b/app/models/commit.rb index 78e67c09d93..d8670f13f28 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -252,21 +252,21 @@ class Commit end def cherry_pick_description(user) - message_buffer = "(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_buffer << "\n" + message_body << "\n" commits_in_merge_request.reverse.each do |commit_in_merge| - message_buffer << "\n#{commit_in_merge.short_id} #{commit_in_merge.title}" + message_body << "\n#{commit_in_merge.short_id} #{commit_in_merge.title}" end end end - message_buffer + message_body end def cherry_pick_message(user)