diff options
| -rw-r--r-- | app/controllers/projects/commit_controller.rb | 2 | ||||
| -rw-r--r-- | spec/controllers/projects/commit_controller_spec.rb | 2 | ||||
| -rw-r--r-- | spec/features/projects/commit/cherry_pick_spec.rb | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb index 44b176d304e..641e1d362b5 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.", + create_commit(Commits::CherryPickService, success_notice: "The #{@commit.change_type_title(current_user)} has been successfully cherry-picked into #{@start_branch}.", success_path: -> { successful_change_path }, failure_path: failed_change_path) end diff --git a/spec/controllers/projects/commit_controller_spec.rb b/spec/controllers/projects/commit_controller_spec.rb index 916a4be2567..9e149bc4c3c 100644 --- a/spec/controllers/projects/commit_controller_spec.rb +++ b/spec/controllers/projects/commit_controller_spec.rb @@ -230,7 +230,7 @@ describe Projects::CommitController do id: master_pickable_commit.id) expect(response).to redirect_to project_commits_path(project, 'master') - expect(flash[:notice]).to eq('The commit has been successfully cherry-picked.') + expect(flash[:notice]).to eq('The commit has been successfully cherry-picked into master.') end end diff --git a/spec/features/projects/commit/cherry_pick_spec.rb b/spec/features/projects/commit/cherry_pick_spec.rb index bc3c00dafe2..d53d6d32c3c 100644 --- a/spec/features/projects/commit/cherry_pick_spec.rb +++ b/spec/features/projects/commit/cherry_pick_spec.rb @@ -21,7 +21,7 @@ describe 'Cherry-pick Commits' do uncheck 'create_merge_request' click_button 'Cherry-pick' end - expect(page).to have_content('The commit has been successfully cherry-picked.') + expect(page).to have_content('The commit has been successfully cherry-picked into master.') end end @@ -32,7 +32,7 @@ describe 'Cherry-pick Commits' do uncheck 'create_merge_request' click_button 'Cherry-pick' end - expect(page).to have_content('The commit has been successfully cherry-picked.') + expect(page).to have_content('The commit has been successfully cherry-picked into master.') end end @@ -59,7 +59,7 @@ describe 'Cherry-pick Commits' do page.within('#modal-cherry-pick-commit') do click_button 'Cherry-pick' end - expect(page).to have_content('The commit has been successfully cherry-picked. You can now submit a merge request to get this change into the original branch.') + expect(page).to have_content('The commit has been successfully cherry-picked into master. You can now submit a merge request to get this change into the original branch.') expect(page).to have_content("From cherry-pick-#{master_pickable_commit.short_id} into master") end end @@ -86,7 +86,7 @@ describe 'Cherry-pick Commits' do click_button 'Cherry-pick' end - expect(page).to have_content('The commit has been successfully cherry-picked.') + expect(page).to have_content('The commit has been successfully cherry-picked into master.') end end |