diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-09-01 16:19:16 +0100 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-10-13 14:16:34 -0500 |
| commit | 9727366b5a0a39a125925e2a7a78ed47e29b02f7 (patch) | |
| tree | 4c7c6f55be59b356266f8a6b5a295d299997da95 | |
| parent | 3f71c43e88c56bb5310c8814cd9f95cafb4f53ef (diff) | |
| download | gitlab-ce-9727366b5a0a39a125925e2a7a78ed47e29b02f7.tar.gz | |
Make RuboCop happy
| -rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index 1311b4aa264..b4f637c93e2 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -678,7 +678,6 @@ describe Projects::MergeRequestsController do conflict_for_path('files/ruby/regex.rb') end - it 'returns a 404 status code' do expect(response).to have_http_status(:not_found) end |