summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-11-25 09:01:12 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-11-25 09:01:12 +0000
commit85d537ac737eeb4a1d2c7b8585d0b86c86feb408 (patch)
treef43854ff5d46e0a62a40bbd050787b3ead6afbf6 /Gemfile
parentcbdccf66bfbe27718e8d976579d74a18aa8586c8 (diff)
parent446a95d3079e8927dd40c8d41a58d66192721cfc (diff)
downloadgitlab-ce-85d537ac737eeb4a1d2c7b8585d0b86c86feb408.tar.gz
Merge branch 'rs-update-rack-oauth2' into 'master'
Bump rack-oauth2 to ~> 1.2.1 Closes #2748 See merge request !1891
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 25f1a0b9ef3..08dfd23aa20 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,7 +28,7 @@ gem 'omniauth-saml', '~> 1.4.0'
gem 'omniauth-shibboleth', '~> 1.2.0'
gem 'omniauth-twitter', '~> 1.2.0'
gem 'omniauth_crowd'
-gem 'rack-oauth2', '~> 1.0.5'
+gem 'rack-oauth2', '~> 1.2.1'
# Two-factor authentication
gem 'devise-two-factor', '~> 2.0.0'