diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-09-01 10:24:29 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-09-01 10:24:29 +0000 |
| commit | 096850a49abb54041cb3086ae34deb11e7380cb7 (patch) | |
| tree | 3303bb2ecca3957212a48b3aa94e64b75f849c95 /spec/requests/api/v3 | |
| parent | 15ad0ac1e741e462c3742cd4db8ca008a0c4f61d (diff) | |
| parent | 934eef72902d6e753f47f7f8dbc42959c399ad09 (diff) | |
| download | gitlab-ce-096850a49abb54041cb3086ae34deb11e7380cb7.tar.gz | |
Merge branch 'sm-cherry-pick-list-commits-in-message' into 'master'
Add 'from commit' information to cherry-picked commits
See merge request !13475
Diffstat (limited to 'spec/requests/api/v3')
| -rw-r--r-- | spec/requests/api/v3/commits_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/requests/api/v3/commits_spec.rb b/spec/requests/api/v3/commits_spec.rb index 4a4a5dc5c7c..8fb96b3c7c5 100644 --- a/spec/requests/api/v3/commits_spec.rb +++ b/spec/requests/api/v3/commits_spec.rb @@ -474,7 +474,7 @@ describe API::V3::Commits do expect(response).to have_http_status(201) expect(json_response['title']).to eq(master_pickable_commit.title) - expect(json_response['message']).to eq(master_pickable_commit.message) + expect(json_response['message']).to eq(master_pickable_commit.cherry_pick_message(user)) expect(json_response['author_name']).to eq(master_pickable_commit.author_name) expect(json_response['committer_name']).to eq(user.name) end |