diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-11-27 13:23:02 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-11-27 13:23:02 +0100 |
| commit | f8e07ca5cdd0d4203d31aa5f0fce79690d5a5190 (patch) | |
| tree | 928e06a97ccd3c3eeef3b3c0ac03c8f59d516e59 /Gemfile | |
| parent | 6b6e633c095485f95350c4308a942192e5fe8806 (diff) | |
| parent | 496a6b3dc5274cca08fe58c1d9a7cdc7d10d325b (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile index 57ecc2fb9..3541eb9fa 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ gem 'makara', '~> 0.4' gem 'pghero', '~> 2.2' gem 'dotenv-rails', '~> 2.5' -gem 'aws-sdk-s3', '~> 1.23', require: false +gem 'aws-sdk-s3', '~> 1.25', require: false gem 'fog-core', '<= 2.1.0' gem 'fog-openstack', '~> 0.3', require: false gem 'paperclip', '~> 6.0' @@ -77,14 +77,14 @@ gem 'sanitize', '~> 5.0' gem 'sidekiq', '~> 5.2' gem 'sidekiq-scheduler', '~> 3.0' gem 'sidekiq-unique-jobs', '~> 5.0' -gem 'sidekiq-bulk', '~>0.1.1' +gem 'sidekiq-bulk', '~>0.2.0' gem 'simple-navigation', '~> 4.0' -gem 'simple_form', '~> 4.0' +gem 'simple_form', '~> 4.1' gem 'sprockets-rails', '~> 3.2', require: 'sprockets/railtie' gem 'stoplight', '~> 2.1.3' gem 'strong_migrations', '~> 0.3' gem 'tty-command', '~> 0.8', require: false -gem 'tty-prompt', '~> 0.17', require: false +gem 'tty-prompt', '~> 0.18', require: false gem 'twitter-text', '~> 1.14' gem 'tzinfo-data', '~> 1.2018' gem 'webpacker', '~> 3.5' @@ -107,7 +107,7 @@ group :production, :test do end group :test do - gem 'capybara', '~> 3.10' + gem 'capybara', '~> 3.11' gem 'climate_control', '~> 0.2' gem 'faker', '~> 1.9' gem 'microformats', '~> 4.0' |