kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #38124 from weilandia/direct_upload_xls_in_chrome

Browse source 
Defaults content_type to application/octet-stream in blob_record.js
This commit is contained in:
Javan Makhmali 2020-01-07 13:44:08 -05:00 committed by GitHub
commit 11781d0632
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
activestorage/app/assets/javascripts/activestorage.js
View file

@ -550,7 +550,7 @@
this.file = file; this.file = file;
this.attributes = { this.attributes = {
filename: file.name, filename: file.name,
content_type: file.type, content_type: file.type || "application/octet-stream",
byte_size: file.size, byte_size: file.size,
checksum: checksum checksum: checksum
}; };

2
activestorage/app/javascript/activestorage/blob_record.js
View file

@ -6,7 +6,7 @@ export class BlobRecord {
this.attributes = { this.attributes = {
filename: file.name, filename: file.name,
content_type: file.type, content_type: file.type || "application/octet-stream",
byte_size: file.size, byte_size: file.size,
checksum: checksum checksum: checksum
} }