summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-08-18 18:05:17 -0500
committerRobert Speicher <rspeicher@gmail.com>2016-08-18 18:05:17 -0500
commitce3e5f84308149eabe9e25b0e0178f825a159b47 (patch)
treea422f481e0737ca36268ebe15f2e820b69208877 /Gemfile.lock
parent717366d28da11acc6dbe60301bf7e2394400b3c1 (diff)
downloadgitlab-ce-ce3e5f84308149eabe9e25b0e0178f825a159b47.tar.gz
Update doorkeeper to 4.2.0
Changelog: https://git.io/v6PnV
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 f32d30bccd8..c0595ae6dc9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -176,7 +176,7 @@ GEM
diff-lcs (1.2.5)
diffy (3.0.7)
docile (1.1.5)
- doorkeeper (4.0.0)
+ doorkeeper (4.2.0)
railties (>= 4.2)
dropzonejs-rails (0.7.2)
rails (> 3.1)
@@ -836,7 +836,7 @@ DEPENDENCIES
devise (~> 4.0)
devise-two-factor (~> 3.0.0)
diffy (~> 3.0.3)
- doorkeeper (~> 4.0)
+ doorkeeper (~> 4.2.0)
dropzonejs-rails (~> 0.7.1)
email_reply_parser (~> 0.5.8)
email_spec (~> 1.6.0)