diff options
author | Saverio Miroddi <saverio.pub2@gmail.com> | 2017-08-21 20:50:48 +0200 |
---|---|---|
committer | Saverio Miroddi <saverio.pub2@gmail.com> | 2017-08-21 20:50:48 +0200 |
commit | 83417865d06226d23edde69cf98b3d3b88aff07f (patch) | |
tree | 7ef5a686570cb11f5189626da90707b261ee341a /app/models/commit.rb | |
parent | 9ec358af7bfe95c90d1c3c3fdd1db8a3a69c11ed (diff) | |
download | gitlab-ce-83417865d06226d23edde69cf98b3d3b88aff07f.tar.gz |
Change a variable name in Commit#cherry_pick_description
Diffstat (limited to 'app/models/commit.rb')
-rw-r--r-- | app/models/commit.rb | 8 |
1 files changed, 4 insertions, 4 deletions
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) |