diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-11-12 15:40:10 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-11-12 15:40:10 +0000 |
| commit | 1116de5eeb27748495ead7f837ba0c63131b6df2 (patch) | |
| tree | c76006d58397d5b7567384f3da0f33444de48e3e | |
| parent | 56834e6bb2ac1e8ef2e448f215217f89f477a7a2 (diff) | |
| parent | e1079ee28ff5868d94cb503f27578e39ef82ee32 (diff) | |
| download | gitlab-ce-1116de5eeb27748495ead7f837ba0c63131b6df2.tar.gz | |
Merge branch 'sh-bump-mime-types' into 'master'
Bump mime-types to 3.2.2
See merge request gitlab-org/gitlab-ce!22957
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | spec/controllers/concerns/send_file_upload_spec.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 8570fabb72f..f8e8607c90e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -451,9 +451,9 @@ GEM memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) method_source (0.9.0) - mime-types (3.1) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) + mime-types-data (3.2018.0812) mimemagic (0.3.0) 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 4f1f6bb31f3..379b2d6b935 100644 --- a/spec/controllers/concerns/send_file_upload_spec.rb +++ b/spec/controllers/concerns/send_file_upload_spec.rb @@ -76,7 +76,7 @@ describe SendFileUpload do it 'sends a file with a custom type' do headers = double - expected_headers = %r(response-content-disposition=attachment%3Bfilename%3D%22test.js%22&response-content-type=application/javascript) + expected_headers = %r(response-content-disposition=attachment%3Bfilename%3D%22test.js%22&response-content-type=application/ecmascript) 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:/) |