diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-12-11 18:28:19 +0300 |
|---|---|---|
| committer | LUKE BENNETT <lbennett@gitlab.com> | 2017-12-13 16:55:40 +0300 |
| commit | 1096319ef6402963ac8d76410fa542c3ce8788ca (patch) | |
| tree | c74593bbb3d0bd04e2a8a7dd07e031b2a289fe28 | |
| parent | ced708d39e580e6427e742a4f3f9d634c0d90f33 (diff) | |
Merge branch 'sh-bump-prometheus-gem-properly' into 'master'
Properly bump prometheus-client-mmap gem versions
See merge request gitlab-org/gitlab-ce!15825
(cherry picked from commit a2d1648076cf55b09562f7ef081fd9e479398ab6)
938cc162 Properly bump prometheus-client-mmap gem versions
| -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 6213167ae0b..60c29ac65c9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1107,7 +1107,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) |