summaryrefslogtreecommitdiff
path: root/spec/requests/api/merge_requests_spec.rb
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <mail@zjvandeweg.nl>2015-12-03 10:27:34 +0100
committerZeger-Jan van de Weg <mail@zjvandeweg.nl>2015-12-05 15:42:38 +0100
commit2462a96e459c95f987f39e3c380de7c7cc350cfd (patch)
tree065157ddb9e707a911bc38c878662bfaf0cca3c2 /spec/requests/api/merge_requests_spec.rb
parent25907ebe476a24bfdd2c451f18227d4fcf314b07 (diff)
downloadgitlab-ce-2462a96e459c95f987f39e3c380de7c7cc350cfd.tar.gz
Incorporate feedback
Diffstat (limited to 'spec/requests/api/merge_requests_spec.rb')
-rw-r--r--spec/requests/api/merge_requests_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index 91ae2059e95..6b7a066ac40 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -303,7 +303,7 @@ describe API::API, api: true do
end
describe "PUT /projects/:id/merge_request/:merge_request_id/merge" do
- let (:ci_commit) { create(:ci_commit_without_jobs) }
+ let(:ci_commit) { create(:ci_commit_without_jobs) }
it "should return merge_request in case of success" do
put api("/projects/#{project.id}/merge_request/#{merge_request.id}/merge", user)