From 1c49c30119ebce11f3a0b7cc93dc0c88e04d39db Mon Sep 17 00:00:00 2001
From: Valery Sizov <valery@gitlab.com>
Date: Tue, 13 Jan 2015 15:46:00 -0800
Subject: [PATCH] doorkeeper update
---
Gemfile | 2 +-
Gemfile.lock | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Gemfile b/Gemfile
index 8769148baf0fa..b403e85a2d1be 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,7 +29,7 @@ gem 'omniauth-twitter'
gem 'omniauth-github'
gem 'omniauth-shibboleth'
gem 'omniauth-kerberos'
-gem 'doorkeeper', '2.0.1'
+gem 'doorkeeper', '2.1.0'
gem "rack-oauth2", "~> 1.0.5"
# Browser detection
diff --git a/Gemfile.lock b/Gemfile.lock
index 94e29735b7160..c6aa35a391700 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -109,7 +109,7 @@ GEM
diff-lcs (1.2.5)
diffy (3.0.3)
docile (1.1.5)
- doorkeeper (2.0.1)
+ doorkeeper (2.1.0)
railties (>= 3.1)
dotenv (0.9.0)
dropzonejs-rails (0.4.14)
@@ -633,7 +633,7 @@ DEPENDENCIES
devise (= 3.2.4)
devise-async (= 0.9.0)
diffy (~> 3.0.3)
- doorkeeper (= 2.0.1)
+ doorkeeper (= 2.1.0)
dropzonejs-rails
email_spec
enumerize
--
GitLab