summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPawel Chojnacki <pawel@chojnacki.ws>2017-10-11 16:23:23 +0200
committerPawel Chojnacki <pawel@chojnacki.ws>2017-10-19 15:58:30 +0300
commitf9a4f184f303e881469d892ceea719c13ab7b768 (patch)
treeca11631a872ab1848d64c0e312a72ef5773b3b15
parent5a2acfe036b4ce2c74b015101c57f040b851899c (diff)
downloadgitlab-ce-f9a4f184f303e881469d892ceea719c13ab7b768.tar.gz
Update Prometheus gem to fix problems with other files overwriting current file
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index c1988aea803..80cbf87cd09 100644
--- a/Gemfile
+++ b/Gemfile
@@ -281,7 +281,7 @@ group :metrics do
gem 'influxdb', '~> 0.2', require: false
# Prometheus
- gem 'prometheus-client-mmap', '~>0.7.0.beta14'
+ gem 'prometheus-client-mmap', '~>0.7.0.beta17'
gem 'raindrops', '~> 0.18'
end
diff --git a/Gemfile.lock b/Gemfile.lock
index f5712da7508..ecf09da283a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -620,7 +620,7 @@ GEM
parser
unparser
procto (0.0.3)
- prometheus-client-mmap (0.7.0.beta14)
+ prometheus-client-mmap (0.7.0.beta17)
mmap2 (~> 2.2, >= 2.2.7)
pry (0.10.4)
coderay (~> 1.1.0)
@@ -1103,7 +1103,7 @@ DEPENDENCIES
pg (~> 0.18.2)
poltergeist (~> 1.9.0)
premailer-rails (~> 1.9.7)
- prometheus-client-mmap (~> 0.7.0.beta14)
+ prometheus-client-mmap (~> 0.7.0.beta17)
pry-byebug (~> 3.4.1)
pry-rails (~> 0.3.4)
rack-attack (~> 4.4.1)