Merge branch 'update-rack-oauth2' into 'master'
Update rack-oauth2 1.2.1 -> 1.9.3 Closes #21732 See merge request gitlab-org/gitlab-ce!17868
This commit is contained in:
commit
1d9b1ae3e7
2
Gemfile
2
Gemfile
|
@ -42,7 +42,7 @@ gem 'omniauth-shibboleth', '~> 1.3.0'
|
||||||
gem 'omniauth-twitter', '~> 1.4'
|
gem 'omniauth-twitter', '~> 1.4'
|
||||||
gem 'omniauth_crowd', '~> 2.2.0'
|
gem 'omniauth_crowd', '~> 2.2.0'
|
||||||
gem 'omniauth-authentiq', '~> 0.3.3'
|
gem 'omniauth-authentiq', '~> 0.3.3'
|
||||||
gem 'rack-oauth2', '~> 1.2.1'
|
gem 'rack-oauth2', '~> 1.9.3'
|
||||||
gem 'jwt', '~> 2.1.0'
|
gem 'jwt', '~> 2.1.0'
|
||||||
|
|
||||||
# Spam and anti-bot protection
|
# Spam and anti-bot protection
|
||||||
|
|
16
Gemfile.lock
16
Gemfile.lock
|
@ -65,7 +65,7 @@ GEM
|
||||||
atomic (1.1.99)
|
atomic (1.1.99)
|
||||||
attr_encrypted (3.1.0)
|
attr_encrypted (3.1.0)
|
||||||
encryptor (~> 3.0.0)
|
encryptor (~> 3.0.0)
|
||||||
attr_required (1.0.0)
|
attr_required (1.0.1)
|
||||||
awesome_print (1.8.0)
|
awesome_print (1.8.0)
|
||||||
axiom-types (0.1.1)
|
axiom-types (0.1.1)
|
||||||
descendants_tracker (~> 0.0.4)
|
descendants_tracker (~> 0.0.4)
|
||||||
|
@ -622,12 +622,12 @@ GEM
|
||||||
rack-attack (4.4.1)
|
rack-attack (4.4.1)
|
||||||
rack
|
rack
|
||||||
rack-cors (1.0.2)
|
rack-cors (1.0.2)
|
||||||
rack-oauth2 (1.2.3)
|
rack-oauth2 (1.9.3)
|
||||||
activesupport (>= 2.3)
|
activesupport
|
||||||
attr_required (>= 0.0.5)
|
attr_required
|
||||||
httpclient (>= 2.4)
|
httpclient
|
||||||
multi_json (>= 1.3.6)
|
json-jwt (>= 1.9.0)
|
||||||
rack (>= 1.1)
|
rack
|
||||||
rack-protection (2.0.5)
|
rack-protection (2.0.5)
|
||||||
rack
|
rack
|
||||||
rack-proxy (0.6.0)
|
rack-proxy (0.6.0)
|
||||||
|
@ -1103,7 +1103,7 @@ DEPENDENCIES
|
||||||
rack (= 2.0.6)
|
rack (= 2.0.6)
|
||||||
rack-attack (~> 4.4.1)
|
rack-attack (~> 4.4.1)
|
||||||
rack-cors (~> 1.0.0)
|
rack-cors (~> 1.0.0)
|
||||||
rack-oauth2 (~> 1.2.1)
|
rack-oauth2 (~> 1.9.3)
|
||||||
rack-proxy (~> 0.6.0)
|
rack-proxy (~> 0.6.0)
|
||||||
rails (= 5.0.7.1)
|
rails (= 5.0.7.1)
|
||||||
rails-controller-testing
|
rails-controller-testing
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Update rack-oauth2 1.2.1 -> 1.9.3
|
||||||
|
merge_request: 17868
|
||||||
|
author:
|
||||||
|
type: other
|
Loading…
Reference in New Issue