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

Merge branch 'rs-update-rack-cors' into 'master'
af3a8f96 · Nick Thomas · 83ae8efa · ca235107 · af3a8f96 · af3a8f96
Commit af3a8f96 authored Jan 08, 2018 by Nick Thomas
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

Gemfile Gemfile +1 -1

Gemfile.lock Gemfile.lock +3 -3

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -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'

--- 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