summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2016-12-13 08:26:14 +0100
committerRobert Schilling <rschilling@student.tugraz.at>2016-12-13 16:12:48 +0100
commit51cfd554aff461a4e8649459a53562e990321b3a (patch)
tree7a005913021f21dad2751fd2f7b3c224945f5d22
parent1a81fcfbd8261862c9614f0ea317af02ae20b24a (diff)
downloadgitlab-ce-api-cherry-pick.tar.gz
Make rubocop happyapi-cherry-pick
-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 fd600798eeb..5ce229a8cf2 100644
--- a/spec/requests/api/commits_spec.rb
+++ b/spec/requests/api/commits_spec.rb
@@ -482,7 +482,7 @@ describe API::Commits, api: true do
project.team << [user2, :developer]
protected_branch = create(:protected_branch, project: project, name: 'feature')
- post api("/projects/#{project.id}/repository/commits/#{master_pickable_commit.id}/cherry_pick", user2), branch: 'feature'
+ post api("/projects/#{project.id}/repository/commits/#{master_pickable_commit.id}/cherry_pick", user2), branch: protected_branch.name
expect(response).to have_http_status(400)
expect(json_response['message']).to eq('You are not allowed to push into this branch')