diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-03-27 21:54:44 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-03-27 21:54:44 +0100 |
| commit | 7b435fd9bf81265241fab792d8e8e0c2f4f1b619 (patch) | |
| tree | ef366f436ed5180489cc9377268e10328fe9a932 /Gemfile | |
| parent | 02f1c04fabab221130de8dfb5611be81825b193b (diff) | |
| parent | 6c79b7237e31eb510af7df3f4f2cb133dea39845 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/services/post_status_service.rb`: CW/sensitive logic fixed upstream, but different in glitch-soc. Ported the changes accordingly.
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile index d0bff213a..0ebf5f2a6 100644 --- a/Gemfile +++ b/Gemfile @@ -20,7 +20,7 @@ gem 'makara', '~> 0.4' gem 'pghero', '~> 2.4' gem 'dotenv-rails', '~> 2.7' -gem 'aws-sdk-s3', '~> 1.60', require: false +gem 'aws-sdk-s3', '~> 1.61', require: false gem 'fog-core', '<= 2.1.0' gem 'fog-openstack', '~> 0.3', require: false gem 'paperclip', '~> 6.0' @@ -48,7 +48,7 @@ gem 'omniauth-cas', '~> 1.1' gem 'omniauth-saml', '~> 1.10' gem 'omniauth', '~> 1.9' -gem 'discard', '~> 1.1' +gem 'discard', '~> 1.2' gem 'doorkeeper', '~> 5.3' gem 'fast_blank', '~> 1.0' gem 'fastimage' |