diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-12-07 20:45:08 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-12-07 20:45:08 +0300 |
| commit | aa24f7e1abac167189a76590dbaccd5b53726507 (patch) | |
| tree | 86bc7205981bcc4e52072a7db49d91bdc34ac2ea /app | |
| parent | 989d3148e1a274fb6baf1d90f28dcfaa331a57b0 (diff) | |
| parent | ee22a47d629fb13a52100921761f833acd80dbd9 (diff) | |
Merge branch 'pawel/update-prometheus_gem_to_highly_optimized_version' into 'master'
Update prometheus-client-mmap gem to highly optimized version
See merge request gitlab-org/gitlab-ce!15796
Diffstat (limited to 'app')
| -rw-r--r-- | app/services/metrics_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/metrics_service.rb b/app/services/metrics_service.rb index 6b3939aeba5..236e9fe8c44 100644 --- a/app/services/metrics_service.rb +++ b/app/services/metrics_service.rb @@ -20,7 +20,7 @@ class MetricsService end def metrics_text - "#{health_metrics_text}#{prometheus_metrics_text}" + prometheus_metrics_text.concat(health_metrics_text) end private |