diff options
| author | Connor Shea <connor.james.shea@gmail.com> | 2016-07-01 15:34:27 -0600 |
|---|---|---|
| committer | Connor Shea <connor.james.shea@gmail.com> | 2016-07-01 15:34:27 -0600 |
| commit | d500ce9d3352e199be7370380c7e2b16958f7ecf (patch) | |
| tree | 2d541d4f9428435d9b82346cf1b426515ed08d6b /Gemfile.lock | |
| parent | 0ccdc631e6f45c0fd327631decb47f80d781302e (diff) | |
| download | gitlab-ce-d500ce9d3352e199be7370380c7e2b16958f7ecf.tar.gz | |
Upgrade Doorkeeper from 3.1.0 to 4.0.0.upgrade-doorkeeper
Includes Rails 5 support and various bug fixes.
Changelog: https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md#400
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 45cb327168c..119b29077b6 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) |