summaryrefslogtreecommitdiff
path: root/spec/initializers/database_config_spec.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-22 09:07:51 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-22 09:07:51 +0000
commit3ad11f24ca52d42694a8ce920a87ead6085d3f85 (patch)
treed5b664aafa7c2b65f470a700431d336d908c0ebc /spec/initializers/database_config_spec.rb
parent62fcb9ffa9e40db6f34e7dd0d36804d73ef01435 (diff)
downloadgitlab-ce-3ad11f24ca52d42694a8ce920a87ead6085d3f85.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/initializers/database_config_spec.rb')
-rw-r--r--spec/initializers/database_config_spec.rb1
1 files changed, 1 insertions, 0 deletions
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