diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-08-18 23:23:21 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-08-18 23:23:21 +0000 |
| commit | c5aa31c83145366d88ce6d8d91e68467cf5baed4 (patch) | |
| tree | d27f3f6fd940c17746cae3ad74258b895845ad0d | |
| parent | a59c33e4a3c492bdf05c67be47a5ba14d40e7bb8 (diff) | |
| parent | ce3e5f84308149eabe9e25b0e0178f825a159b47 (diff) | |
| download | gitlab-ce-c5aa31c83145366d88ce6d8d91e68467cf5baed4.tar.gz | |
Merge branch 'rs-update-doorkeeper' into 'master'
Update doorkeeper to 4.2.0
Changelog: https://git.io/v6PnV
See merge request !5881
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -20,7 +20,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 fd033360bee..5511d718938 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -176,7 +176,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) @@ -836,7 +836,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) |