diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-05-14 14:14:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-14 14:14:00 -0500 |
| commit | b5684e987484661ba63fc9815c03667a8a93586e (patch) | |
| tree | 755476fb27484fb36bd01578f8f22d4dd8d64562 /Gemfile | |
| parent | 46659655439e7d76726aa38ed5d599a795b3790f (diff) | |
| parent | ba7ee67498905cbc96d531d45a80e284880e09ee (diff) | |
Merge pull request #481 from ThibG/glitch-soc/merge
Merge upstream changes
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile index 71f5823df..0ead19733 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.3' +gem 'doorkeeper', '~> 4.2', '< 4.3' gem 'fast_blank', '~> 1.0' gem 'fastimage' gem 'goldfinger', '~> 2.1' @@ -52,6 +52,7 @@ gem 'html2text' 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' |