diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-08-19 02:23:21 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-08-19 21:43:38 +0300 |
| commit | 5967c8c76fce753390fcc07be52dd558bf137230 (patch) | |
| tree | dc324a46c156db7eb46a1ec6d0d334e7c2f495f2 | |
| parent | 8b21b00fadfb43b23a7a6f460e19b6064470159c (diff) | |
Merge branch 'rs-update-doorkeeper' into 'master'
Update doorkeeper to 4.2.0
Changelog: https://git.io/v6PnV
See merge request !5881
(cherry picked from commit c5aa31c83145366d88ce6d8d91e68467cf5baed4)
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -19,7 +19,7 @@ gem 'pg', '~> 0.18.2', group: :postgres # Authentication libraries gem 'devise', '~> 4.0' -gem 'doorkeeper', '~> 4.0' +gem 'doorkeeper', '~> 4.2.0' gem 'omniauth', '~> 1.3.1' gem 'omniauth-auth0', '~> 1.4.1' gem 'omniauth-azure-oauth2', '~> 0.0.6' diff --git a/Gemfile.lock b/Gemfile.lock index a5eddd17b27..43c2aa18084 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -171,7 +171,7 @@ GEM diff-lcs (1.2.5) diffy (3.0.7) docile (1.1.5) - doorkeeper (4.0.0) + doorkeeper (4.2.0) railties (>= 4.2) dropzonejs-rails (0.7.2) rails (> 3.1) @@ -838,7 +838,7 @@ DEPENDENCIES devise (~> 4.0) devise-two-factor (~> 3.0.0) diffy (~> 3.0.3) - doorkeeper (~> 4.0) + doorkeeper (~> 4.2.0) dropzonejs-rails (~> 0.7.1) email_reply_parser (~> 0.5.8) email_spec (~> 1.6.0) |