diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-07-05 13:48:48 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-07-05 13:48:48 +0000 |
| commit | 38533a2f4252921bbfde126c887510481aeaa01e (patch) | |
| tree | f034e26b32c2cca6aae9c47b7a232ea011c29f08 /Gemfile | |
| parent | 63f9c8d85bae26c2be8154c690530b3a8409a3e7 (diff) | |
| parent | d500ce9d3352e199be7370380c7e2b16958f7ecf (diff) | |
| download | gitlab-ce-38533a2f4252921bbfde126c887510481aeaa01e.tar.gz | |
Merge branch 'upgrade-doorkeeper' into 'master'
Upgrade Doorkeeper from 3.1.0 to 4.0.0.
Includes Rails 5 support and various bug fixes. Working toward #14286.
Changelog: https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md#400
See merge request !5055
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -19,7 +19,7 @@ gem "pg", '~> 0.18.2', group: :postgres # Authentication libraries gem 'devise', '~> 4.0' -gem 'doorkeeper', '~> 3.1' +gem 'doorkeeper', '~> 4.0' gem 'omniauth', '~> 1.3.1' gem 'omniauth-auth0', '~> 1.4.1' gem 'omniauth-azure-oauth2', '~> 0.0.6' |