summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorPawel Chojnacki <pawel@chojnacki.ws>2017-05-29 14:19:43 +0200
committerPawel Chojnacki <pawel@chojnacki.ws>2017-06-02 19:45:58 +0200
commitc134a72cdb7e6de8b70dc60de99cf4edc68a9227 (patch)
tree0082ba4d422cc53eea223583bca9c98cbc823c96 /Gemfile
parent770f07cd5c68075bb261f4b6139c92b2ac9309c0 (diff)
downloadgitlab-ce-c134a72cdb7e6de8b70dc60de99cf4edc68a9227.tar.gz
Move Prometheus presentation logic to PrometheusText
+ Use NullMetrics to mock metrics when unused + Use method_missing in NullMetrics mocking + Update prometheus gem to version that correctly uses transitive dependencies + Ensure correct folders are used in Multiprocess prometheus client tests. + rename Sessions controller's metric
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile3
1 files changed, 1 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 8ec2c94a2e0..0c18007d447 100644
--- a/Gemfile
+++ b/Gemfile
@@ -270,8 +270,7 @@ group :metrics do
gem 'influxdb', '~> 0.2', require: false
# Prometheus
- gem 'mmap2', '~> 2.2.6'
- gem 'prometheus-client-mmap', '~>0.7.0.beta3'
+ gem 'prometheus-client-mmap', '~>0.7.0.beta5'
end
group :development do