summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorconnorshea <connor.james.shea@gmail.com>2016-04-10 14:47:01 -0600
committerConnor Shea <connor.james.shea@gmail.com>2016-04-28 11:43:39 -0600
commita94b71c301c8fa0741ba7b4958c30d04f7f10341 (patch)
tree50c39b5342187b73a80fcbd1773ef83513a12f1d /Gemfile.lock
parent973b948b9e9553a57113983fa4e32207b581e0ad (diff)
downloadgitlab-ce-a94b71c301c8fa0741ba7b4958c30d04f7f10341.tar.gz
Upgrade Doorkeeper from 2.2.2 to 3.1.0
I’d rather upgrade one major version at a time, so Doorkeeper needs to be upgraded to 3.x before it can be upgraded to 4.x (which includes Rails 5 support). Changelog: https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md#310
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 91d89b4875a..9c97426cb5d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -173,7 +173,7 @@ GEM
diff-lcs (1.2.5)
diffy (3.0.7)
docile (1.1.5)
- doorkeeper (2.2.2)
+ doorkeeper (3.1.0)
railties (>= 3.2)
dropzonejs-rails (0.7.2)
rails (> 3.1)
@@ -922,7 +922,7 @@ DEPENDENCIES
devise (~> 3.5.4)
devise-two-factor (~> 2.0.0)
diffy (~> 3.0.3)
- doorkeeper (~> 2.2.0)
+ doorkeeper (~> 3.1)
dropzonejs-rails (~> 0.7.1)
email_reply_parser (~> 0.5.8)
email_spec (~> 1.6.0)