Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42

1 files changed, 8 insertions, 0 deletions

diff --git a/spec/controllers/projects/commits_controller_spec.rb b/spec/controllers/projects/commits_controller_spec.rb
index c7f98406201..26d4725656f 100644
--- a/spec/controllers/projects/commits_controller_spec.rb
+++ b/spec/controllers/projects/commits_controller_spec.rb
@@ -166,6 +166,14 @@ RSpec.describe Projects::CommitsController do
           end
         end
       end
+
+      context 'with markdown cache' do
+        it 'preloads markdown cache for commits' do
+          expect(Commit).to receive(:preload_markdown_cache!).and_call_original
+
+          get :show, params: { namespace_id: project.namespace, project_id: project, id: 'master/README.md' }
+        end
+      end
     end
 
     describe "GET /commits/:id/signatures" do