BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 1096319e by Robert Speicher Committed by LUKE BENNETT
Options

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 a2d16480) 938cc162 Properly bump prometheus-client-mmap gem versions
parent ced708d3
Showing with 2 additions and 2 deletions
Gemfile
...@@ -283,7 +283,7 @@ group :metrics do ...@@ -283,7 +283,7 @@ group :metrics do
gem 'influxdb', '~> 0.2', require: false gem 'influxdb', '~> 0.2', require: false
# Prometheus # Prometheus
gem 'prometheus-client-mmap', '~> 0.7.0.beta39' gem 'prometheus-client-mmap', '~> 0.7.0.beta43'
gem 'raindrops', '~> 0.18' gem 'raindrops', '~> 0.18'
end end
......
Gemfile.lock
...@@ -1107,7 +1107,7 @@ DEPENDENCIES ...@@ -1107,7 +1107,7 @@ DEPENDENCIES
peek-sidekiq (~> 1.0.3) peek-sidekiq (~> 1.0.3)
pg (~> 0.18.2) pg (~> 0.18.2)
premailer-rails (~> 1.9.7) 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-byebug (~> 3.4.1)
pry-rails (~> 0.3.4) pry-rails (~> 0.3.4)
rack-attack (~> 4.4.1) rack-attack (~> 4.4.1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment