diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2018-01-02 14:20:42 -0600 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2018-01-02 14:20:42 -0600 |
| commit | ca2351073420ec9b45642388b78f2462aec7b11d (patch) | |
| tree | fa5fd17722238fa676b5f69e0926f457ddea8994 | |
| parent | 2cbb2d0eceaed0f31c92d4eed8932e98f4f74559 (diff) | |
| download | gitlab-ce-ca2351073420ec9b45642388b78f2462aec7b11d.tar.gz | |
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 3cffed4901b..b5c233946ef 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) @@ -1126,7 +1126,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) @@ -1205,4 +1205,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.16.0 + 1.16.1 |