diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-12 00:09:40 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-12 00:09:40 +0300 |
commit | 213f46f188c29e9c442df61530110e172a7e819e (patch) | |
tree | 8544300e523c4e8cc3955406fa58e2d4b8ded773 /spec/commands | |
parent | 33f7ef81fd6bcab7bbdf0bc3f37d337256fb11fb (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/commands')
-rw-r--r-- | spec/commands/metrics_server/metrics_server_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/commands/metrics_server/metrics_server_spec.rb b/spec/commands/metrics_server/metrics_server_spec.rb index f93be1d9f88..310e31da045 100644 --- a/spec/commands/metrics_server/metrics_server_spec.rb +++ b/spec/commands/metrics_server/metrics_server_spec.rb @@ -70,7 +70,8 @@ RSpec.describe 'GitLab metrics server', :aggregate_failures do before do if use_golang_server stub_env('GITLAB_GOLANG_METRICS_SERVER', '1') - allow(Settings).to receive(:monitoring).and_return(config.dig('test', 'monitoring')) + allow(Settings).to receive(:monitoring).and_return( + Settingslogic.new(config.dig('test', 'monitoring'))) else config_file.write(YAML.dump(config)) config_file.close |