diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-05-27 18:59:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-27 18:59:48 +0200 |
| commit | bbc9ca5d38c342f3afa87835f86cdbe82a9affdb (patch) | |
| tree | 193863c7b8bbd25c77ea6489134db3cb9397ed3f /Gemfile | |
| parent | 2024aef0f9b52297d814811f5825678a563f78ff (diff) | |
| parent | 10a31a934fb62a95d6144794b9c449f1092593f0 (diff) | |
Merge pull request #1544 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 77858e9e2..c2845a295 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.94', require: false +gem 'aws-sdk-s3', '~> 1.95', require: false gem 'fog-core', '<= 2.1.0' gem 'fog-openstack', '~> 0.3', require: false gem 'paperclip', '~> 6.0' @@ -91,7 +91,7 @@ gem 'strong_migrations', '~> 0.7' gem 'tty-prompt', '~> 0.23', require: false gem 'twitter-text', '~> 3.1.0' gem 'tzinfo-data', '~> 1.2021' -gem 'webpacker', '~> 5.3' +gem 'webpacker', '~> 5.4' gem 'webpush', '~> 0.3' gem 'webauthn', '~> 3.0.0.alpha1' |