diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-05-14 20:51:50 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-05-14 20:51:50 +0200 |
commit | ba7ee67498905cbc96d531d45a80e284880e09ee (patch) | |
tree | 755476fb27484fb36bd01578f8f22d4dd8d64562 /Gemfile.lock | |
parent | 46659655439e7d76726aa38ed5d599a795b3790f (diff) | |
parent | 03b69ebc450efc07246bd64204276941b7ede3fc (diff) |
Merge branch 'master' into glitch-soc/merge
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 41307654c..0656f16fd 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: @@ -167,7 +174,7 @@ GEM docile (1.3.0) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) - doorkeeper (4.3.2) + doorkeeper (4.2.6) railties (>= 4.2) dotenv (2.2.2) dotenv-rails (2.2.2) @@ -254,7 +261,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) @@ -661,7 +667,7 @@ DEPENDENCIES devise (~> 4.4) devise-two-factor (~> 3.0) devise_pam_authenticatable2 (~> 9.1) - doorkeeper (~> 4.3) + doorkeeper (~> 4.2, < 4.3) dotenv-rails (~> 2.2, < 2.3) fabrication (~> 2.20) faker (~> 1.8) @@ -678,6 +684,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 |