diff options
| author | Paweł Chojnacki <pawel@chojnacki.ws> | 2017-07-19 08:54:39 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-07-19 08:54:39 +0000 |
| commit | 2c3d52161af2f170bdb644b96b6ffe5da0c1df10 (patch) | |
| tree | a4e5d5766c8c74cd782ea18e46afeddf8ae027e1 /spec/controllers/metrics_controller_spec.rb | |
| parent | fa8ec52a717a1e019e867ebd884c20f5f17bbe02 (diff) | |
| download | gitlab-ce-2c3d52161af2f170bdb644b96b6ffe5da0c1df10.tar.gz | |
Update Prometheus gem to version that explicitly calls `munmap`
Diffstat (limited to 'spec/controllers/metrics_controller_spec.rb')
| -rw-r--r-- | spec/controllers/metrics_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/metrics_controller_spec.rb b/spec/controllers/metrics_controller_spec.rb index 8964d89b438..7b0976e3e67 100644 --- a/spec/controllers/metrics_controller_spec.rb +++ b/spec/controllers/metrics_controller_spec.rb @@ -12,7 +12,7 @@ describe MetricsController do before do stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false') - stub_env('prometheus_multiproc_dir', metrics_multiproc_dir) + allow(Prometheus::Client.configuration).to receive(:multiprocess_files_dir).and_return(metrics_multiproc_dir) allow(Gitlab::Metrics).to receive(:prometheus_metrics_enabled?).and_return(true) allow(Settings.monitoring).to receive(:ip_whitelist).and_return([whitelisted_ip, whitelisted_ip_range]) end |