From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 24 Aug 2018 16:17:11 +0000 (+0200)
Subject: Upgrade Doorkeeper to 5.0.0 (#8409)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=b37ae645788e1951e3b1737519f32803e5e1b6ad;p=mastodon.git

Upgrade Doorkeeper to 5.0.0 (#8409)

See doorkeeper-gem/doorkeeper#1137
---

diff --git a/Gemfile b/Gemfile
index 516d397a2..d7275017f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -41,7 +41,7 @@ gem 'omniauth-cas', '~> 1.1'
 gem 'omniauth-saml', '~> 1.10'
 gem 'omniauth', '~> 1.2'
 
-gem 'doorkeeper', '~> 4.4'
+gem 'doorkeeper', '~> 5.0'
 gem 'fast_blank', '~> 1.0'
 gem 'fastimage'
 gem 'goldfinger', '~> 2.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index ea0e3f0cd..a11a715c4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -181,7 +181,7 @@ GEM
     docile (1.3.0)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
-    doorkeeper (4.4.2)
+    doorkeeper (5.0.0)
       railties (>= 4.2)
     dotenv (2.2.2)
     dotenv-rails (2.2.2)
@@ -670,7 +670,7 @@ DEPENDENCIES
   devise (~> 4.4)
   devise-two-factor (~> 3.0)
   devise_pam_authenticatable2 (~> 9.1)
-  doorkeeper (~> 4.4)
+  doorkeeper (~> 5.0)
   dotenv-rails (~> 2.2, < 2.3)
   fabrication (~> 2.20)
   faker (~> 1.8)