Commit 87e1b4e2 authored by Mark Chao's avatar Mark Chao

Merge branch 'bvl-update-prometheus-client' into 'master'

Update Prometheus client to 0.15.0

See merge request gitlab-org/gitlab!69463
parents 6221877e c1fa6238
...@@ -333,7 +333,7 @@ gem 'snowplow-tracker', '~> 0.6.1' ...@@ -333,7 +333,7 @@ gem 'snowplow-tracker', '~> 0.6.1'
# Metrics # Metrics
gem 'method_source', '~> 1.0', require: false gem 'method_source', '~> 1.0', require: false
gem 'webrick', '~> 1.6.1', require: false gem 'webrick', '~> 1.6.1', require: false
gem 'prometheus-client-mmap', '~> 0.14.0', require: 'prometheus/client' gem 'prometheus-client-mmap', '~> 0.15.0', require: 'prometheus/client'
gem 'warning', '~> 1.2.0' gem 'warning', '~> 1.2.0'
......
...@@ -925,7 +925,7 @@ GEM ...@@ -925,7 +925,7 @@ GEM
coderay coderay
parser parser
unparser unparser
prometheus-client-mmap (0.14.0) prometheus-client-mmap (0.15.0)
pry (0.13.1) pry (0.13.1)
coderay (~> 1.1) coderay (~> 1.1)
method_source (~> 1.0) method_source (~> 1.0)
...@@ -1574,7 +1574,7 @@ DEPENDENCIES ...@@ -1574,7 +1574,7 @@ DEPENDENCIES
pg_query (~> 2.1) pg_query (~> 2.1)
png_quantizator (~> 0.2.1) png_quantizator (~> 0.2.1)
premailer-rails (~> 1.10.3) premailer-rails (~> 1.10.3)
prometheus-client-mmap (~> 0.14.0) prometheus-client-mmap (~> 0.15.0)
pry-byebug pry-byebug
pry-rails (~> 0.3.9) pry-rails (~> 0.3.9)
pry-shell (~> 0.4.0) pry-shell (~> 0.4.0)
......
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