diff options
| author | Saverio Miroddi <saverio.pub2@gmail.com> | 2017-08-15 21:17:52 +0200 |
|---|---|---|
| committer | Saverio Miroddi <saverio.pub2@gmail.com> | 2017-08-15 21:17:52 +0200 |
| commit | 85aeb884386f9943f8cc95cb1d2faabf011e5c6a (patch) | |
| tree | 85be80017cc589d12a282737bd34f9ea50776769 | |
| parent | e33608d8e4367a04d855d047aceb65a927b3d8d8 (diff) | |
| download | gitlab-ce-85aeb884386f9943f8cc95cb1d2faabf011e5c6a.tar.gz | |
Add support for start project to commit cherry-pick description
| -rw-r--r-- | app/models/commit.rb | 8 | ||||
| -rw-r--r-- | app/models/repository.rb | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb index 314004ae58a..f36e07fc3ca 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -251,11 +251,11 @@ class Commit project.repository.next_branch("cherry-pick-#{short_id}", mild: true) end - def cherry_pick_description(start_branch_name) + def cherry_pick_description(start_project, start_branch_name) message_buffer = "(cherry picked from commit #{sha})" if merge_commit? - compare = CompareService.new(project, sha).execute(project, start_branch_name) + compare = CompareService.new(project, sha).execute(start_project, start_branch_name) # Ignore the merge commit. commits_in_merge = compare.commits[0..-2] @@ -272,8 +272,8 @@ class Commit message_buffer end - def cherry_pick_message(start_branch_name) - %Q{#{message}\n\n#{cherry_pick_description(start_branch_name)}} + def cherry_pick_message(start_project, start_branch_name) + %Q{#{message}\n\n#{cherry_pick_description(start_project, start_branch_name)}} end def revert_description(user) diff --git a/app/models/repository.rb b/app/models/repository.rb index 06117994ac1..c11f9d53497 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -879,7 +879,7 @@ class Repository committer = user_to_committer(user) - commit_message = commit.cherry_pick_message(start_branch_name) + commit_message = commit.cherry_pick_message(start_project, start_branch_name) create_commit(message: commit_message, author: { |