summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-04-29 18:13:50 +0000
committerRobert Speicher <robert@gitlab.com>2016-04-29 18:13:50 +0000
commit47698071d9685b763b2ba87f99b62c36d7735299 (patch)
tree9b2830a328b6c65de5ce16862743bfa52cd6aac5 /Gemfile.lock
parentccd3f707651bad576346852988d5026902a3bb5a (diff)
parenta94b71c301c8fa0741ba7b4958c30d04f7f10341 (diff)
downloadgitlab-ce-47698071d9685b763b2ba87f99b62c36d7735299.tar.gz
Merge branch 'upgrade-doorkeeper' into 'master'
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 Working toward #14286. See merge request !3644
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 1dcda0daff6..b1e954e0884 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)