summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2018-05-21 15:01:21 +0000
committerNick Thomas <nick@gitlab.com>2018-05-21 15:01:21 +0000
commit7e78eacd2a302ac36d09f5170fb9e12ff61c56b4 (patch)
tree2b9f086f79d17ac8a9cf94354b5bf6a351814a23 /Gemfile.lock
parent1a748aa173540d2e9804cb64d0434f78d7a2961f (diff)
parent7fd0f5fc9d52e749a9692e7e6b42308b20e247f3 (diff)
downloadgitlab-ce-7e78eacd2a302ac36d09f5170fb9e12ff61c56b4.tar.gz
Merge branch 'ce-5928-geo-rake-task-to-force-housekeeping-on-next-sync' into 'master'
Backport from EE: Adding Progressbar explicitly and spec extensions for it See merge request gitlab-org/gitlab-ce!18885
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock1
1 files changed, 1 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 18c25cc34b6..2a33c08512a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1150,6 +1150,7 @@ DEPENDENCIES
rubocop-rspec (~> 1.22.1)
ruby-fogbugz (~> 0.2.1)
ruby-prof (~> 0.17.0)
+ ruby-progressbar
ruby_parser (~> 3.8)
rufus-scheduler (~> 3.4)
rugged (~> 0.27)