From 4d706f9976e705c70f32dfbbd78abb8ab7f1dd7a Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Sat, 12 May 2018 19:08:12 +0900
Subject: Downgrade doorkeeper to version 4.2.6 (#7456)

ref https://github.com/doorkeeper-gem/doorkeeper/pull/1060
---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Gemfile')

diff --git a/Gemfile b/Gemfile
index 2beac94d2..5c2f33de4 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.3'
+gem 'doorkeeper', '~> 4.2', '< 4.3'
 gem 'fast_blank', '~> 1.0'
 gem 'fastimage'
 gem 'goldfinger', '~> 2.1'
-- 
cgit 


From f77b11cd10cdc7488e0eb2c07c73b4f4a57ab8b7 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Sun, 13 May 2018 18:32:46 +0900
Subject: Update http_parser.rb to head version (#7467)

---
 Gemfile      | 1 +
 Gemfile.lock | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'Gemfile')

diff --git a/Gemfile b/Gemfile
index 5c2f33de4..1799c2981 100644
--- a/Gemfile
+++ b/Gemfile
@@ -50,6 +50,7 @@ gem 'redis-namespace', '~> 1.5'
 gem 'htmlentities', '~> 4.3'
 gem 'http', '~> 3.2'
 gem 'http_accept_language', '~> 2.1'
+gem 'http_parser.rb', '~> 0.6', git: 'https://github.com/tmm1/http_parser.rb', ref: '54b17ba8c7d8d20a16dfc65d1775241833219cf2'
 gem 'httplog', '~> 1.0'
 gem 'idn-ruby', require: 'idn'
 gem 'kaminari', '~> 1.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 4507cc146..6b7651b77 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,10 @@
+GIT
+  remote: https://github.com/tmm1/http_parser.rb
+  revision: 54b17ba8c7d8d20a16dfc65d1775241833219cf2
+  ref: 54b17ba8c7d8d20a16dfc65d1775241833219cf2
+  specs:
+    http_parser.rb (0.6.1)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -252,7 +259,6 @@ GEM
       domain_name (~> 0.5)
     http-form_data (2.1.0)
     http_accept_language (2.1.1)
-    http_parser.rb (0.6.0)
     httplog (1.0.2)
       colorize (~> 0.8)
       rack (>= 1.0)
@@ -675,6 +681,7 @@ DEPENDENCIES
   htmlentities (~> 4.3)
   http (~> 3.2)
   http_accept_language (~> 2.1)
+  http_parser.rb (~> 0.6)!
   httplog (~> 1.0)
   i18n-tasks (~> 0.9)
   idn-ruby
-- 
cgit