diff options
| author | ThibG <thib@sitedethib.com> | 2020-06-26 16:36:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-26 16:36:55 +0200 |
| commit | 10ede3eb27c5de5d4e3a283e333af2a54da6177d (patch) | |
| tree | 2e88bb2d667a416770a098915d8b3ea16ff9c208 /Gemfile | |
| parent | 8f4aff9b6fe638b26b9d0bf0fe4151c2cc214d6d (diff) | |
| parent | de735286cd62acd9d0fbb0dd54c82098cc3a4993 (diff) | |
Merge pull request #1364 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile index da9e8012e..269f5d01a 100644 --- a/Gemfile +++ b/Gemfile @@ -20,7 +20,7 @@ gem 'makara', '~> 0.4' gem 'pghero', '~> 2.5' gem 'dotenv-rails', '~> 2.7' -gem 'aws-sdk-s3', '~> 1.68', require: false +gem 'aws-sdk-s3', '~> 1.69', require: false gem 'fog-core', '<= 2.1.0' gem 'fog-openstack', '~> 0.3', require: false gem 'paperclip', '~> 6.0' @@ -120,12 +120,12 @@ group :production, :test do end group :test do - gem 'capybara', '~> 3.32' + gem 'capybara', '~> 3.33' gem 'climate_control', '~> 0.2' gem 'faker', '~> 2.12' gem 'microformats', '~> 4.2' gem 'rails-controller-testing', '~> 1.0' - gem 'rspec-sidekiq', '~> 3.0' + gem 'rspec-sidekiq', '~> 3.1' gem 'simplecov', '~> 0.18', require: false gem 'webmock', '~> 3.8' gem 'parallel_tests', '~> 3.0' |