diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-01-08 15:47:14 +0000 |
|---|---|---|
| committer | Luke Bennett <lbennett@gitlab.com> | 2018-01-10 00:17:43 +0000 |
| commit | 8c61a8e1cccce8258c05b230811a9e779b46bcfa (patch) | |
| tree | 2c678859e633efe927f92d271349c6f00ab57b8d | |
| parent | d3271335ccc3a94af295ddacf489e48affe476fc (diff) | |
| download | gitlab-ce-8c61a8e1cccce8258c05b230811a9e779b46bcfa.tar.gz | |
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
(cherry picked from commit af3a8f96f8175353ef5860f4255d63be72a4c5bc)
ca235107 Update rack-cors from 0.4.0 to 1.0.2
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -78,7 +78,7 @@ gem 'github-linguist', '~> 4.7.0', require: 'linguist' # API gem 'grape', '~> 1.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? gem 'hashie-forbidden_attributes' diff --git a/Gemfile.lock b/Gemfile.lock index c854cda48ea..d10da1bd1c3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -651,7 +651,7 @@ GEM rack (>= 0.4) rack-attack (4.4.1) rack - rack-cors (0.4.0) + rack-cors (1.0.2) rack-oauth2 (1.2.3) activesupport (>= 2.3) attr_required (>= 0.0.5) @@ -1133,7 +1133,7 @@ DEPENDENCIES pry-byebug (~> 3.4.1) pry-rails (~> 0.3.4) rack-attack (~> 4.4.1) - rack-cors (~> 0.4.0) + rack-cors (~> 1.0.0) rack-oauth2 (~> 1.2.1) rack-proxy (~> 0.6.0) rails (= 4.2.10) @@ -1212,4 +1212,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.16.0 + 1.16.1 |