diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-02-22 16:50:15 -0600 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-02-23 09:33:05 -0600 |
| commit | 1fe7501b49f896b74102c4b970310aa9ae34da85 (patch) | |
| tree | ce271afb0fbaaa14291c1dc9009cd7815ee25463 /spec/requests/api/v3/merge_requests_spec.rb | |
| parent | bdbc7d967a0c3d95d5e4ea19a2a5be41268d3540 (diff) | |
| download | gitlab-ce-1fe7501b49f896b74102c4b970310aa9ae34da85.tar.gz | |
Revert "Prefer leading style for Style/DotPosition"
This reverts commit cb10b725c8929b8b4460f89c9d96c773af39ba6b.
Diffstat (limited to 'spec/requests/api/v3/merge_requests_spec.rb')
| -rw-r--r-- | spec/requests/api/v3/merge_requests_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/requests/api/v3/merge_requests_spec.rb b/spec/requests/api/v3/merge_requests_spec.rb index cb370418e9c..51764d1000e 100644 --- a/spec/requests/api/v3/merge_requests_spec.rb +++ b/spec/requests/api/v3/merge_requests_spec.rb @@ -413,8 +413,8 @@ describe API::MergeRequests, api: true do end it "returns 406 if branch can't be merged" do - allow_any_instance_of(MergeRequest) - .to receive(:can_be_merged?).and_return(false) + allow_any_instance_of(MergeRequest). + to receive(:can_be_merged?).and_return(false) put v3_api("/projects/#{project.id}/merge_requests/#{merge_request.id}/merge", user) |