diff options
| author | George Andrinopoulos <geoandri@gmail.com> | 2018-08-19 23:28:54 +0300 |
|---|---|---|
| committer | George Andrinopoulos <geoandri@gmail.com> | 2018-08-19 23:28:54 +0300 |
| commit | cab5039c91cffd5f1c4f08ce8dce7c67529ec6d1 (patch) | |
| tree | 18a7c61c4f0329da7547c61f52886db4918727a8 | |
| parent | 83c98610711f5986e9b4b34298a3a8d8b95ee0a4 (diff) | |
| download | gitlab-ce-cab5039c91cffd5f1c4f08ce8dce7c67529ec6d1.tar.gz | |
Fix branch name in case of new merge request cherry pick
| -rw-r--r-- | app/controllers/projects/commit_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb index 641e1d362b5..53637780a07 100644 --- a/app/controllers/projects/commit_controller.rb +++ b/app/controllers/projects/commit_controller.rb @@ -101,7 +101,7 @@ class Projects::CommitController < Projects::ApplicationController @branch_name = create_new_branch? ? @commit.cherry_pick_branch_name : @start_branch - create_commit(Commits::CherryPickService, success_notice: "The #{@commit.change_type_title(current_user)} has been successfully cherry-picked into #{@start_branch}.", + create_commit(Commits::CherryPickService, success_notice: "The #{@commit.change_type_title(current_user)} has been successfully cherry-picked into #{@branch_name}.", success_path: -> { successful_change_path }, failure_path: failed_change_path) end |