summaryrefslogtreecommitdiff
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
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
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock6
2 files changed, 4 insertions, 4 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'
diff --git a/Gemfile.lock b/Gemfile.lock
index 6ad0b039c5c..8466e86492e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -359,7 +359,7 @@ GEM
httparty (0.13.5)
json (~> 1.8)
multi_xml (>= 0.5.2)
- httpclient (2.6.0.1)
+ httpclient (2.7.0.1)
i18n (0.7.0)
ice_cube (0.11.1)
ice_nine (0.11.1)
@@ -504,7 +504,7 @@ GEM
rack-cors (0.4.0)
rack-mount (0.8.3)
rack (>= 1.0.0)
- rack-oauth2 (1.0.10)
+ rack-oauth2 (1.2.1)
activesupport (>= 2.3)
attr_required (>= 0.0.5)
httpclient (>= 2.4)
@@ -891,7 +891,7 @@ DEPENDENCIES
quiet_assets (~> 1.0.2)
rack-attack (~> 4.3.0)
rack-cors (~> 0.4.0)
- rack-oauth2 (~> 1.0.5)
+ rack-oauth2 (~> 1.2.1)
rails (= 4.1.14)
raphael-rails (~> 2.1.2)
rblineprof