diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-12-14 10:48:57 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-12-14 10:48:57 +0000 |
| commit | 3a90612660ab90225907ec6d79032905885c2507 (patch) | |
| tree | 323be12fdd431097fc0ce019d05a332c531cbe15 | |
| parent | 78f89f7ad900ec2f2993a70caa2eb5dbf9e2496f (diff) | |
| parent | de038bf755dcdea842264d9f90572ae92b5f845b (diff) | |
| download | gitlab-ce-3a90612660ab90225907ec6d79032905885c2507.tar.gz | |
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
| -rw-r--r-- | spec/requests/api/commits_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/requests/api/commits_spec.rb b/spec/requests/api/commits_spec.rb index 5ce229a8cf2..964cded917c 100644 --- a/spec/requests/api/commits_spec.rb +++ b/spec/requests/api/commits_spec.rb @@ -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 |