summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-08-18 23:23:21 +0000
committerRuben Davila <rdavila84@gmail.com>2016-08-18 18:50:32 -0500
commit2e66559e382ded6608e40ed522a6d82a9e851956 (patch)
treefd3734ea0f96e06e82514d8d762fb77c71a0c73c /Gemfile
parentf43e5636700c6aa8d17bb526d72776b44494959e (diff)
downloadgitlab-ce-2e66559e382ded6608e40ed522a6d82a9e851956.tar.gz
Merge branch 'rs-update-doorkeeper' into 'master'
Update doorkeeper to 4.2.0 Changelog: https://git.io/v6PnV See merge request !5881
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 1f622081454..b89106edf64 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,7 +20,7 @@ gem 'pg', '~> 0.18.2', group: :postgres
# Authentication libraries
gem 'devise', '~> 4.0'
-gem 'doorkeeper', '~> 4.0'
+gem 'doorkeeper', '~> 4.2.0'
gem 'omniauth', '~> 1.3.1'
gem 'omniauth-auth0', '~> 1.4.1'
gem 'omniauth-azure-oauth2', '~> 0.0.6'