diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-26 18:17:16 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-26 18:17:16 +0000 |
| commit | 6b85dba8daf7ddb59063cadfe4e2a6dc071931d5 (patch) | |
| tree | 9af293d43f7d0685edaaa1a79edb1a68b70ba3bb /Gemfile.lock | |
| parent | bed13f22e24763620f2c2d3bcbfe15937336fa88 (diff) | |
| parent | 127bfda521d97fd173acf3c4fdcedcb065f7eefb (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 72d323dcb..8af7872af 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -623,6 +623,7 @@ DEPENDENCIES rspec-sidekiq (~> 3.0) rubocop ruby-oembed (~> 0.12) + ruby-progressbar (~> 1.4) sanitize (~> 4.4) scss_lint (~> 0.55) sidekiq (~> 5.0) @@ -645,4 +646,4 @@ RUBY VERSION ruby 2.4.2p198 BUNDLED WITH - 1.16.0 + 1.16.1 |