diff options
| author | ThibG <thib@sitedethib.com> | 2019-01-16 16:28:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-16 16:28:38 +0100 |
| commit | 530d29148ca0c5bf29f6fa516b1ef4f91d95894b (patch) | |
| tree | e074e7b778e973b12e754d939cc5e2805eb012d6 /Gemfile | |
| parent | 077639c27409f897e87522dd18a51801b6cbc40d (diff) | |
| parent | 5684cd090caec27729d78c204911348a0cf62cbf (diff) | |
Merge pull request #887 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile index 3912180a1..5b523f338 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,7 @@ gem 'hamlit-rails', '~> 0.2' gem 'pg', '~> 1.1' gem 'makara', '~> 0.4' gem 'pghero', '~> 2.2' -gem 'dotenv-rails', '~> 2.5' +gem 'dotenv-rails', '~> 2.6' gem 'aws-sdk-s3', '~> 1.30', require: false gem 'fog-core', '<= 2.1.0' @@ -76,7 +76,7 @@ gem 'rqrcode', '~> 0.10' gem 'sanitize', '~> 5.0' gem 'sidekiq', '~> 5.2' gem 'sidekiq-scheduler', '~> 3.0' -gem 'sidekiq-unique-jobs', '~> 5.0' +gem 'sidekiq-unique-jobs', '~> 6.0' gem 'sidekiq-bulk', '~>0.2.0' gem 'simple-navigation', '~> 4.0' gem 'simple_form', '~> 4.1' @@ -146,3 +146,5 @@ group :production do gem 'lograge', '~> 0.10' gem 'redis-rails', '~> 5.0' end + +gem 'concurrent-ruby', require: false |