Commit 8b5c6a68 authored by Ash McKenzie's avatar Ash McKenzie

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
parents 944d3d4c 47d3610d
......@@ -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)
......
......@@ -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:/)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment