diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-08-19 02:23:21 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-08-20 00:07:21 +0300 |
| commit | 70ee364074ae9217a6e1566f7a005b36f998b7d4 (patch) | |
| tree | e691cb43bae86d14a97708b66b33ac5de17a91a3 | |
| parent | 01d6ce4a02b0cbbb106e7248591eee5c66a3c9e7 (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 634b645524b..c0eed4317f7 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.8.9 + - Upgrade Doorkeeper to 4.2.0. !5881 + v 8.8.8 - Upgrade Rails to 4.2.7.1 for security fixes. !5781 @@ -19,7 +19,7 @@ gem "pg", '~> 0.18.2', group: :postgres # Authentication libraries gem 'devise', '~> 3.5.4' -gem 'doorkeeper', '~> 3.1' +gem 'doorkeeper', '~> 4.2.0' gem 'devise-async', '~> 0.9.0' gem 'omniauth', '~> 1.3.1' gem 'omniauth-auth0', '~> 1.4.1' diff --git a/Gemfile.lock b/Gemfile.lock index 3bdb3a6e748..428b4e7e29b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -172,8 +172,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) @@ -917,7 +917,7 @@ DEPENDENCIES devise-async (~> 0.9.0) devise-two-factor (~> 2.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) |