Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaverio Miroddi <saverio.pub2@gmail.com>2017-08-16 13:43:18 +0300
committerSaverio Miroddi <saverio.pub2@gmail.com>2017-08-16 13:43:18 +0300
commitae5e806f128e8e737948f4286da92526c74c316e (patch)
tree2c1af4f8fd2a1a0b13c4f77fcf55c666aa34f309 /spec/requests/api/commits_spec.rb
parent85aeb884386f9943f8cc95cb1d2faabf011e5c6a (diff)
Fix build failures related to cherry-pick message changes
Diffstat (limited to 'spec/requests/api/commits_spec.rb')
-rw-r--r--spec/requests/api/commits_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/requests/api/commits_spec.rb b/spec/requests/api/commits_spec.rb
index 992a6e8d76a..1fba7fcc10a 100644
--- a/spec/requests/api/commits_spec.rb
+++ b/spec/requests/api/commits_spec.rb
@@ -791,7 +791,7 @@ describe API::Commits do
expect(response).to have_gitlab_http_status(201)
expect(response).to match_response_schema('public_api/v4/commit/basic')
expect(json_response['title']).to eq(commit.title)
- expect(json_response['message']).to eq(commit.message)
+ expect(json_response['message']).to eq(commit.cherry_pick_message(project, branch))
expect(json_response['author_name']).to eq(commit.author_name)
expect(json_response['committer_name']).to eq(user.name)
end