summaryrefslogtreecommitdiff
path: root/Gemfile
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
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')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 7882e467f8d..25c13fda575 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,7 +19,7 @@ gem "pg", '~> 0.18.2', group: :postgres
# Authentication libraries
gem 'devise', '~> 3.5.4'
-gem 'doorkeeper', '~> 2.2.0'
+gem 'doorkeeper', '~> 3.1'
gem 'omniauth', '~> 1.3.1'
gem 'omniauth-auth0', '~> 1.4.1'
gem 'omniauth-azure-oauth2', '~> 0.0.6'