Make RuboCop happy

9727366b · Sean McGivern · Alfredo Sumaran · 3f71c43e · 9727366b
Commit 9727366b authored Sep 01, 2016 by Sean McGivern Committed by Alfredo Sumaran Oct 13, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

spec/controllers/projects/merge_requests_controller_spec.rb spec/controllers/projects/merge_requests_controller_spec.rb +0 -1

No files found.
--- 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