summaryrefslogtreecommitdiff
path: root/spec/controllers/projects
diff options
context:
space:
mode:
authorGeorge Andrinopoulos <geoandri@gmail.com>2018-07-25 21:22:01 +0300
committerGeorge Andrinopoulos <geoandri@gmail.com>2018-08-19 23:11:49 +0300
commit70830c23002c198d96cae1bf9cdf153b025f9c09 (patch)
tree4499094d1178aba839cf3db6668b1e457213025f /spec/controllers/projects
parent00baed8cb0725f7e05e6dab4e498acf2b425a5b2 (diff)
downloadgitlab-ce-70830c23002c198d96cae1bf9cdf153b025f9c09.tar.gz
Add target branch to cherry pick confirmation message
Diffstat (limited to 'spec/controllers/projects')
-rw-r--r--spec/controllers/projects/commit_controller_spec.rb2
1 files changed, 1 insertions, 1 deletions
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