Broken master
Seen in https://gitlab.com/gitlab-org/gitlab-ce/builds/7392269:
1) API::Commits POST :id/repository/commits/:sha/cherry_pick authorized user returns 400 if commit is already included in the target branch
Failure/Error:
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.')
expected: "Sorry, we cannot cherry-pick this commit automatically.\n It may have already been cherry-pick, or a more recent commit may have updated some of its content."
got: "Sorry, we cannot cherry-pick this commit automatically.\n A cherry-pick may have...eady been performed with this commit, or a more recent commit may have updated some of its content."
(compared using ==)
Diff:
@@ -1,3 +1,3 @@
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.
# ./spec/requests/api/commits_spec.rb:477:in `block (4 levels) in <top (required)>'
/cc @razer6