diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-12-14 09:26:19 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-12-14 09:26:19 +0100 |
| commit | de038bf755dcdea842264d9f90572ae92b5f845b (patch) | |
| tree | 1a54cbb7aed4e6cac52b01cd8957560d0f91bc84 | |
| parent | 3e8118d689824ef299c1069eff6150849046c0b5 (diff) | |
| download | gitlab-ce-25651-fix-master.tar.gz | |
Fix wrong error message expectation in API::Commits spec25651-fix-master
This was because the MR was a bit behind master and the error message
got updated in the meantime by 79aad815.
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -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 |