diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-08-19 02:23:21 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-08-19 22:26:09 +0300 |
| commit | 3459f5528e2722d81dc8984397c003ffe4149738 (patch) | |
| tree | 8781fd1b7e48e298383339c8cf23e77f4fbffead | |
| parent | 9515631b5a04b7eb3709daec081838615bf08d4a (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-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG index be0cb5378de..eef855cfbf5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,8 @@ Please view this file on the master branch, on stable branches it's out of date. +v 8.9.8 + - Upgrade Doorkeeper to 4.2.0. !5881 + v 8.9.7 - Upgrade Rails to 4.2.7.1 for security fixes. !5781 - Require administrator privileges to perform a project import. @@ -19,7 +19,7 @@ gem "pg", '~> 0.18.2', group: :postgres # Authentication libraries gem 'devise', '~> 4.0' -gem 'doorkeeper', '~> 3.1' +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 d9020279d00..b7e13180255 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -177,8 +177,8 @@ GEM diff-lcs (1.2.5) diffy (3.0.7) docile (1.1.5) - doorkeeper (3.1.0) - railties (>= 3.2) + doorkeeper (4.2.0) + railties (>= 4.2) dropzonejs-rails (0.7.2) rails (> 3.1) email_reply_parser (0.5.8) @@ -851,7 +851,7 @@ DEPENDENCIES devise (~> 4.0) devise-two-factor (~> 3.0.0) diffy (~> 3.0.3) - doorkeeper (~> 3.1) + doorkeeper (~> 4.2.0) dropzonejs-rails (~> 0.7.1) email_reply_parser (~> 0.5.8) email_spec (~> 1.6.0) |