diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-08 09:25:33 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-08 09:25:33 +0000 |
| commit | 2272e1d4194890e7889c5e3a65be4982ac55385c (patch) | |
| tree | 50076cf7fec4bf2e7df27934223dc75532954a20 /Gemfile | |
| parent | 978b433cdbaeee621674c38da3c0da75f7af8f33 (diff) | |
| parent | 5e01e1bb901c967e71d165a1e664b49538277c10 (diff) | |
| download | gitlab-ce-2272e1d4194890e7889c5e3a65be4982ac55385c.tar.gz | |
Merge branch 'rs-update-rack-cors' into 'master'
Update rack-cors to ~> 0.4.0
Closes #2800
See merge request !1536
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -65,9 +65,9 @@ gem 'gollum-lib', '~> 4.0.2' gem "gitlab-linguist", "~> 3.0.1", require: "linguist" # API -gem "grape", "~> 0.6.1" -gem "grape-entity", "~> 0.4.2" -gem 'rack-cors', '~> 0.2.9', require: 'rack/cors' +gem 'grape', '~> 0.6.1' +gem 'grape-entity', '~> 0.4.2' +gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' # Format dates and times # based on human-friendly examples |