diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-11-06 00:33:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-06 00:33:55 +0100 |
| commit | a25839340e93b1e93b7b99b0f65fa7da7d62bad2 (patch) | |
| tree | a329d65c115e752c3be5c262ebf96f69cd13861a /Gemfile | |
| parent | e0f39626973fd9f5cce2d4cd3b166fb47e9c9059 (diff) | |
| parent | 4bb6b1a1e788abac7d1745e0f4eb72ad4d4ec110 (diff) | |
Merge pull request #1628 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile index a3337e8f1..005f02faf 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,7 @@ gem 'makara', '~> 0.5' gem 'pghero', '~> 2.8' gem 'dotenv-rails', '~> 2.7' -gem 'aws-sdk-s3', '~> 1.103', require: false +gem 'aws-sdk-s3', '~> 1.104', require: false gem 'fog-core', '<= 2.1.0' gem 'fog-openstack', '~> 0.3', require: false gem 'kt-paperclip', '~> 7.0' @@ -114,7 +114,7 @@ group :production, :test do end group :test do - gem 'capybara', '~> 3.35' + gem 'capybara', '~> 3.36' gem 'climate_control', '~> 0.2' gem 'faker', '~> 2.19' gem 'microformats', '~> 4.2' |