diff options
| author | Ash McKenzie <amckenzie@gitlab.com> | 2019-06-17 00:58:57 +0000 |
|---|---|---|
| committer | Ash McKenzie <amckenzie@gitlab.com> | 2019-06-17 00:58:57 +0000 |
| commit | 8b5c6a687326b0b5de478185c7e99e4ec60fb8c1 (patch) | |
| tree | 9fc628d41585db3ab42ddd70f28b7fd4568716e3 | |
| parent | 944d3d4c80c01aa1d16df239664f0cca37413495 (diff) | |
| parent | 47d3610d0d532c0bea6c7434c47a1f9b59164201 (diff) | |
| download | gitlab-ce-8b5c6a687326b0b5de478185c7e99e4ec60fb8c1.tar.gz | |
Merge branch 'sh-bump-mime-types-data' into 'master'
Upgrade mime-types-data to 3.2019.0331
See merge request gitlab-org/gitlab-ce!29729
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | spec/controllers/concerns/send_file_upload_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 05a926b1b6c..46c7991515c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -499,7 +499,7 @@ GEM method_source (0.9.2) mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2018.0812) + mime-types-data (3.2019.0331) mimemagic (0.3.2) mini_magick (4.8.0) mini_mime (1.0.1) diff --git a/spec/controllers/concerns/send_file_upload_spec.rb b/spec/controllers/concerns/send_file_upload_spec.rb index a3ce08f736c..3bf0ec799c7 100644 --- a/spec/controllers/concerns/send_file_upload_spec.rb +++ b/spec/controllers/concerns/send_file_upload_spec.rb @@ -115,7 +115,7 @@ describe SendFileUpload do it 'sends a file with a custom type' do headers = double - expected_headers = /response-content-disposition=attachment%3B%20filename%3D%22test.js%22%3B%20filename%2A%3DUTF-8%27%27test.js&response-content-type=application%2Fecmascript/ + expected_headers = /response-content-disposition=attachment%3B%20filename%3D%22test.js%22%3B%20filename%2A%3DUTF-8%27%27test.js&response-content-type=application%2Fjavascript/ expect(Gitlab::Workhorse).to receive(:send_url).with(expected_headers).and_call_original expect(headers).to receive(:store).with(Gitlab::Workhorse::SEND_DATA_HEADER, /^send-url:/) |