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

Merge branch '25651-fix-master' into 'master'
3a906126 · Rémy Coutable · 78f89f7a · de038bf7 · 3a906126
Commit 3a906126 authored Dec 14, 2016 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

commits_spec.rb spec/requests/api/commits_spec.rb +1 -1

No files found.
--- 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