Commit 06585944 authored by Thong Kuah's avatar Thong Kuah

Merge branch 'sh-service-template-bug' into 'master'

Disable Rails SQL query cache when applying service templates

Closes #63595

See merge request gitlab-org/gitlab-ce!30060
parents 565274aa d4c87d4d
......@@ -24,7 +24,7 @@ module Projects
def propagate_projects_with_template
loop do
batch = project_ids_batch
batch = Project.uncached { project_ids_batch }
bulk_create_from_template(batch) unless batch.empty?
......
---
title: Disable Rails SQL query cache when applying service templates
merge_request: 30060
author:
type: fixed
......@@ -72,7 +72,7 @@ describe Projects::PropagateServiceTemplate do
expect(project.pushover_service.properties).to eq(service_template.properties)
end
describe 'bulk update' do
describe 'bulk update', :use_sql_query_cache do
let(:project_total) { 5 }
before do
......
......@@ -218,6 +218,12 @@ RSpec.configure do |config|
ActionController::Base.cache_store = caching_store
end
config.around(:each, :use_sql_query_cache) do |example|
ActiveRecord::Base.cache do
example.run
end
end
# The :each scope runs "inside" the example, so this hook ensures the DB is in the
# correct state before any examples' before hooks are called. This prevents a
# problem where `ScheduleIssuesClosedAtTypeChange` (or any migration that depends
......
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