Merge branch 'rs-update-rack-cors' into 'master'
Update rack-cors from 0.4.0 to 1.0.2 Closes #41199 See merge request gitlab-org/gitlab-ce!16183
This commit is contained in:
commit
af3a8f96f8
2
Gemfile
2
Gemfile
|
@ -78,7 +78,7 @@ gem 'github-linguist', '~> 4.7.0', require: 'linguist'
|
||||||
# API
|
# API
|
||||||
gem 'grape', '~> 1.0'
|
gem 'grape', '~> 1.0'
|
||||||
gem 'grape-entity', '~> 0.6.0'
|
gem 'grape-entity', '~> 0.6.0'
|
||||||
gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'
|
gem 'rack-cors', '~> 1.0.0', require: 'rack/cors'
|
||||||
|
|
||||||
# Disable strong_params so that Mash does not respond to :permitted?
|
# Disable strong_params so that Mash does not respond to :permitted?
|
||||||
gem 'hashie-forbidden_attributes'
|
gem 'hashie-forbidden_attributes'
|
||||||
|
|
|
@ -651,7 +651,7 @@ GEM
|
||||||
rack (>= 0.4)
|
rack (>= 0.4)
|
||||||
rack-attack (4.4.1)
|
rack-attack (4.4.1)
|
||||||
rack
|
rack
|
||||||
rack-cors (0.4.0)
|
rack-cors (1.0.2)
|
||||||
rack-oauth2 (1.2.3)
|
rack-oauth2 (1.2.3)
|
||||||
activesupport (>= 2.3)
|
activesupport (>= 2.3)
|
||||||
attr_required (>= 0.0.5)
|
attr_required (>= 0.0.5)
|
||||||
|
@ -1133,7 +1133,7 @@ DEPENDENCIES
|
||||||
pry-byebug (~> 3.4.1)
|
pry-byebug (~> 3.4.1)
|
||||||
pry-rails (~> 0.3.4)
|
pry-rails (~> 0.3.4)
|
||||||
rack-attack (~> 4.4.1)
|
rack-attack (~> 4.4.1)
|
||||||
rack-cors (~> 0.4.0)
|
rack-cors (~> 1.0.0)
|
||||||
rack-oauth2 (~> 1.2.1)
|
rack-oauth2 (~> 1.2.1)
|
||||||
rack-proxy (~> 0.6.0)
|
rack-proxy (~> 0.6.0)
|
||||||
rails (= 4.2.10)
|
rails (= 4.2.10)
|
||||||
|
@ -1212,4 +1212,4 @@ DEPENDENCIES
|
||||||
wikicloth (= 0.8.1)
|
wikicloth (= 0.8.1)
|
||||||
|
|
||||||
BUNDLED WITH
|
BUNDLED WITH
|
||||||
1.16.0
|
1.16.1
|
||||||
|
|
Loading…
Reference in New Issue