diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-12-11 15:28:19 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-12-11 15:28:19 +0000 |
| commit | a2d1648076cf55b09562f7ef081fd9e479398ab6 (patch) | |
| tree | b327dd4c6982948f50cbc2f3e1afbbe05cdf8ffc | |
| parent | 8ff63039f1ee5f6e31a8b910e323977e7de3c634 (diff) | |
| parent | 938cc162f359e939b788e6b09821da7bb93b5172 (diff) | |
| download | gitlab-ce-a2d1648076cf55b09562f7ef081fd9e479398ab6.tar.gz | |
Merge branch 'sh-bump-prometheus-gem-properly' into 'master'
Properly bump prometheus-client-mmap gem versions
See merge request gitlab-org/gitlab-ce!15825
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -283,7 +283,7 @@ group :metrics do gem 'influxdb', '~> 0.2', require: false # Prometheus - gem 'prometheus-client-mmap', '~> 0.7.0.beta39' + gem 'prometheus-client-mmap', '~> 0.7.0.beta43' gem 'raindrops', '~> 0.18' end diff --git a/Gemfile.lock b/Gemfile.lock index b5ca351fea8..efae71efdb7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1113,7 +1113,7 @@ DEPENDENCIES peek-sidekiq (~> 1.0.3) pg (~> 0.18.2) premailer-rails (~> 1.9.7) - prometheus-client-mmap (~> 0.7.0.beta39) + prometheus-client-mmap (~> 0.7.0.beta43) pry-byebug (~> 3.4.1) pry-rails (~> 0.3.4) rack-attack (~> 4.4.1) |