Commit 3a906126 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch '25651-fix-master' into 'master'

Fix wrong error message expectation in API::Commits spec

See commit message or https://gitlab.com/gitlab-org/gitlab-ce/issues/25651#note_19996076 for the explanation.

Closes #25651

See merge request !8083
parents 78f89f7a de038bf7
Pipeline #5393077 passed with stages
in 96 minutes and 50 seconds
......@@ -475,7 +475,7 @@ describe API::Commits, api: true do
expect(response).to have_http_status(400)
expect(json_response['message']).to eq('Sorry, we cannot cherry-pick this commit automatically.
It may have already been cherry-pick, or a more recent commit may have updated some of its content.')
A cherry-pick may have already been performed with this commit, or a more recent commit may have updated some of its content.')
end
it 'returns 400 if you are not allowed to push to the target branch' do
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment