Commit 78d2ac44 authored by Nick Thomas's avatar Nick Thomas

Fix bad merge in merge_requests_controller_spec.rb

parent d97c6987
...@@ -290,7 +290,7 @@ describe Projects::MergeRequestsController do ...@@ -290,7 +290,7 @@ describe Projects::MergeRequestsController do
recorded = ActiveRecord::QueryRecorder.new { go(format: :json) } recorded = ActiveRecord::QueryRecorder.new { go(format: :json) }
expect(recorded.count).to be_within(5).of(50) expect(recorded.count).to be_within(5).of(95)
expect(recorded.cached_count).to eq(0) expect(recorded.cached_count).to eq(0)
end end
end 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