summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-12-28 01:37:59 +0000
committerStan Hu <stanhu@gmail.com>2016-12-28 01:37:59 +0000
commitb93c72e33a50aaed845fe333dee0201b0b11934e (patch)
tree0a36939d14379ed7585db6e38b9b7f449f809bff /Gemfile.lock
parentd9c94a8b9236e4f8eb140260182d3d8d963495b5 (diff)
parent80a1d74c7fabcdf8929c84a5be7bfcbbff629c8c (diff)
downloadgitlab-ce-b93c72e33a50aaed845fe333dee0201b0b11934e.tar.gz
Merge branch 'mrchrisw-update-vmstat' into 'master'
Update vmstat to version 2.3.0 Closes #26114 See merge request !8318
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 765d57c6238..1c192d2fc6e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -773,7 +773,7 @@ GEM
coercible (~> 1.0)
descendants_tracker (~> 0.0, >= 0.0.3)
equalizer (~> 0.0, >= 0.0.9)
- vmstat (2.2.0)
+ vmstat (2.3.0)
warden (1.2.6)
rack (>= 1.0)
web-console (2.3.0)
@@ -982,7 +982,7 @@ DEPENDENCIES
unicorn-worker-killer (~> 0.4.4)
version_sorter (~> 2.1.0)
virtus (~> 1.0.1)
- vmstat (~> 2.2)
+ vmstat (~> 2.3.0)
web-console (~> 2.0)
webmock (~> 1.21.0)
wikicloth (= 0.8.1)