From 3ad11f24ca52d42694a8ce920a87ead6085d3f85 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Sun, 22 Dec 2019 09:07:51 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/initializers/database_config_spec.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'spec/initializers') diff --git a/spec/initializers/database_config_spec.rb b/spec/initializers/database_config_spec.rb index a5a074f5884..9200a625b38 100644 --- a/spec/initializers/database_config_spec.rb +++ b/spec/initializers/database_config_spec.rb @@ -16,6 +16,7 @@ describe 'Database config initializer' do let(:puma_options) { { max_threads: 8 } } before do + allow(Gitlab::Runtime).to receive(:puma?).and_return(true) stub_const("Puma", puma) allow(puma).to receive_message_chain(:cli_config, :options).and_return(puma_options) end -- cgit v1.2.3