summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-09-17 09:06:11 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-09-17 09:06:11 +0000
commite567b4c2df7dc4085d213db029eff6b6fcde0152 (patch)
tree801718b86d32bdd82a3cd90760e06a4d7a51b71d /Gemfile.lock
parent42b933efc3384386c1991daca1a6d58160f70176 (diff)
downloadgitlab-ce-e567b4c2df7dc4085d213db029eff6b6fcde0152.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 6fd74c1da78..fec34622be3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -715,7 +715,7 @@ GEM
parser
unparser
procto (0.0.3)
- prometheus-client-mmap (0.9.9)
+ prometheus-client-mmap (0.9.10)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
@@ -1250,7 +1250,7 @@ DEPENDENCIES
org-ruby (~> 0.9.12)
pg (~> 1.1)
premailer-rails (~> 1.9.7)
- prometheus-client-mmap (~> 0.9.9)
+ prometheus-client-mmap (~> 0.9.10)
pry-byebug (~> 3.5.1)
pry-rails (~> 0.3.4)
puma (~> 3.12)