diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-05-22 17:20:57 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-05-22 17:20:57 -0500 |
| commit | 6dd13180ccbfecb0038510fa55808dda5952342f (patch) | |
| tree | c22ef069b82d2b1879b2151291017c13175649ae /Gemfile.lock | |
| parent | 601c485cbc7d3d5bd37028d93a42e1e662d3709f (diff) | |
| parent | 76e276cb433a7023cf8154f9d9555725b3b11e67 (diff) | |
| download | gitlab-ce-6dd13180ccbfecb0038510fa55808dda5952342f.tar.gz | |
Merge branch 'master' into bootstrap4
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index c820a4afd16..39b42fe0179 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -623,7 +623,7 @@ GEM parser unparser procto (0.0.3) - prometheus-client-mmap (0.9.2) + prometheus-client-mmap (0.9.3) pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -1108,7 +1108,7 @@ DEPENDENCIES peek-sidekiq (~> 1.0.3) pg (~> 0.18.2) premailer-rails (~> 1.9.7) - prometheus-client-mmap (~> 0.9.2) + prometheus-client-mmap (~> 0.9.3) pry-byebug (~> 3.4.1) pry-rails (~> 0.3.4) rack-attack (~> 4.4.1) @@ -1143,6 +1143,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) |