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 /Gemfile | |
| 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
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 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' |