Commit 9727366b authored by Sean McGivern's avatar Sean McGivern Committed by Alfredo Sumaran

Make RuboCop happy

parent 3f71c43e
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment