diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-17 03:07:45 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-17 03:07:45 +0000 |
commit | 9763c081708e4c2e08de1f4e9ca9abdef5cffe3c (patch) | |
tree | b27794ba1a039cdc42cdf5d90bcb7b7503437324 /spec/initializers | |
parent | 7480d774dfca97ea905321d52c70fd19496f0084 (diff) | |
download | gitlab-ce-9763c081708e4c2e08de1f4e9ca9abdef5cffe3c.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/initializers')
-rw-r--r-- | spec/initializers/database_config_spec.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/spec/initializers/database_config_spec.rb b/spec/initializers/database_config_spec.rb index 9200a625b38..a5a074f5884 100644 --- a/spec/initializers/database_config_spec.rb +++ b/spec/initializers/database_config_spec.rb @@ -16,7 +16,6 @@ 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 |