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.lock | |
| 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.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 9b07c97b078..76127ce08e3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -171,8 +171,8 @@ GEM diff-lcs (1.2.5) diffy (3.0.7) docile (1.1.5) - doorkeeper (3.1.0) - railties (>= 3.2) + doorkeeper (4.0.0) + railties (>= 4.2) dropzonejs-rails (0.7.2) rails (> 3.1) email_reply_parser (0.5.8) @@ -840,7 +840,7 @@ DEPENDENCIES devise (~> 4.0) devise-two-factor (~> 3.0.0) diffy (~> 3.0.3) - doorkeeper (~> 3.1) + doorkeeper (~> 4.0) dropzonejs-rails (~> 0.7.1) email_reply_parser (~> 0.5.8) email_spec (~> 1.6.0) |