diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-06-21 13:48:12 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-06-21 13:48:12 +0000 |
| commit | 0430b7644101fc70ed4be6bf69ccf05b900f4cdf (patch) | |
| tree | 3ea258c4da6e0f9c6e0f7523191fdb0a64a15c73 /spec/requests/api/v3/merge_requests_spec.rb | |
| parent | 78ee24ba53a4a44d829613495ec0d5f1bbb5a9ee (diff) | |
| download | gitlab-ce-0430b7644101fc70ed4be6bf69ccf05b900f4cdf.tar.gz | |
Enable Style/DotPosition Rubocop :cop:
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 f6ff96be566..4f9e63f2ace 100644 --- a/spec/requests/api/v3/merge_requests_spec.rb +++ b/spec/requests/api/v3/merge_requests_spec.rb @@ -432,8 +432,8 @@ describe API::MergeRequests 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) |