about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAkiraFukushima <h3.poteto@gmail.com>2018-08-19 10:20:37 +0900
committerEugen Rochko <eugen@zeonfederated.com>2018-08-19 03:20:37 +0200
commit58ffe3f7c3d73f02d646869a5ed500fa7ff846d6 (patch)
tree62ac91008738ead15ca73f4d04efc6606405889b
parent025fbb8285cdedf495d9e4d015db611b0c622cbb (diff)
Revert "Upgrade Doorkeeper to 4.4.1 (#8197)" (#8231)
* Revert "Upgrade Doorkeeper to 4.4.1 (#8197)"

This reverts commit 464daffdf9a37e9a773d224a162fad022890d463.

* Except migration files from revert commit
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 31c3c8086..5a6afe9ad 100644
--- a/Gemfile
+++ b/Gemfile
@@ -42,7 +42,7 @@ gem 'omniauth-cas', '~> 1.1'
 gem 'omniauth-saml', '~> 1.10'
 gem 'omniauth', '~> 1.2'
 
-gem 'doorkeeper', '~> 4.4'
+gem 'doorkeeper', '~> 4.2', '< 4.3'
 gem 'fast_blank', '~> 1.0'
 gem 'fastimage'
 gem 'goldfinger', '~> 2.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 71f2f6c7d..32851c67b 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.1)
+    doorkeeper (4.2.6)
       railties (>= 4.2)
     dotenv (2.2.2)
     dotenv-rails (2.2.2)
@@ -672,7 +672,7 @@ DEPENDENCIES
   devise (~> 4.4)
   devise-two-factor (~> 3.0)
   devise_pam_authenticatable2 (~> 9.1)
-  doorkeeper (~> 4.4)
+  doorkeeper (~> 4.2, < 4.3)
   dotenv-rails (~> 2.2, < 2.3)
   fabrication (~> 2.20)
   faker (~> 1.8)