diff options
| author | Starfall <us@starfall.systems> | 2020-12-01 10:50:41 -0600 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2020-12-01 10:50:41 -0600 |
| commit | 63f2eb0c84d0c51f7ece341cc3f35518a3d69520 (patch) | |
| tree | 57d362f393ff7ae7fdf6b4a00d654f8dbd9c9d7c /Gemfile | |
| parent | 19548d0a4bc303ca8017599577e21a6d522eb7bd (diff) | |
| parent | 29812c2e59e02ea5ff8e4818a38b59944e2367ba (diff) | |
Merge branch 'glitch' into main
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile index 865d28a26..7f400d2a0 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,7 @@ gem 'makara', '~> 0.4' gem 'pghero', '~> 2.7' gem 'dotenv-rails', '~> 2.7' -gem 'aws-sdk-s3', '~> 1.84', require: false +gem 'aws-sdk-s3', '~> 1.85', require: false gem 'fog-core', '<= 2.1.0' gem 'fog-openstack', '~> 0.3', require: false gem 'paperclip', '~> 6.0' @@ -125,7 +125,7 @@ group :test do gem 'rspec-sidekiq', '~> 3.1' gem 'simplecov', '~> 0.19', require: false gem 'webmock', '~> 3.10' - gem 'parallel_tests', '~> 3.3' + gem 'parallel_tests', '~> 3.4' gem 'rspec_junit_formatter', '~> 0.4' end |