Merge branch 'attempt-to-fix-flaky-test' into 'master'

Don't skip cached queries in a N+1 test

See merge request gitlab-org/gitlab!36342

spec/controllers/concerns/renders_commits_spec.rb

@@ -46,7 +46,7 @@ RSpec.describe RendersCommits do
     it 'avoids N + 1' do
       stub_const("MergeRequestDiff::COMMITS_SAFE_SIZE", 5)
 
-      control_count = ActiveRecord::QueryRecorder.new(skip_cached: false) do
+      control_count = ActiveRecord::QueryRecorder.new do
         go
       end.count