summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2018-01-08 15:47:14 +0000
committerNick Thomas <nick@gitlab.com>2018-01-08 15:47:14 +0000
commitaf3a8f96f8175353ef5860f4255d63be72a4c5bc (patch)
tree3cd73cdbe9119a4452a9c797eb7987ed02b28fd7 /Gemfile
parent83ae8efa4e27a8c2385c59dbe238f54cf684cdd8 (diff)
parentca2351073420ec9b45642388b78f2462aec7b11d (diff)
downloadgitlab-ce-af3a8f96f8175353ef5860f4255d63be72a4c5bc.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
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 4c4a61bb4e4..23d0b3d9b3e 100644
--- 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'