diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-08-21 18:24:48 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-21 18:24:48 +0200 |
| commit | 8b4abaa90d8dff64525d92c3ba1c750356608240 (patch) | |
| tree | 51f194442d2ec7ab760b443b98c7685f64481ca7 /Gemfile | |
| parent | c78918162642649ce294d89effbf2e815c2aa327 (diff) | |
| parent | f06fa099625e928e5858ea81a20be1eddf6c6fbb (diff) | |
Merge branch 'master' into glitch-soc/master
Conflicts: config/routes.rb Added the “endorsements” route from upstream.
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile index 6421693da..760ecbc7c 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,6 @@ gem 'dotenv-rails', '~> 2.2', '< 2.3' gem 'aws-sdk-s3', '~> 1.9', require: false gem 'fog-core', '~> 1.45' -gem 'fog-local', '~> 0.5', require: false gem 'fog-openstack', '~> 0.1', require: false gem 'paperclip', '~> 6.0' gem 'paperclip-av-transcoder', '~> 0.6' @@ -42,7 +41,7 @@ gem 'omniauth-cas', '~> 1.1' gem 'omniauth-saml', '~> 1.10' gem 'omniauth', '~> 1.2' -gem 'doorkeeper', '~> 4.2', '< 4.3' +gem 'doorkeeper', '~> 4.4' gem 'fast_blank', '~> 1.0' gem 'fastimage' gem 'goldfinger', '~> 2.1' |