github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #186 from Arjeno/allow_htc_file_content_type

Browse Source 
Added .htc file content type to white list
This commit is contained in:
Mario Visic 2011-08-30 06:39:04 -07:00
commit c83c6828a9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/uploaders/theme_asset_uploader.rb
View File

@ -9,7 +9,7 @@ class ThemeAssetUploader < CarrierWave::Uploader::Base
end end
def extension_white_list def extension_white_list
%w(jpg jpeg gif png css js swf flv eot svg ttf woff otf ico) %w(jpg jpeg gif png css js swf flv eot svg ttf woff otf ico htc)
end end
def self.url_for(site, path) def self.url_for(site, path)

2
lib/locomotive/carrierwave/asset.rb
View File

@ -21,7 +21,7 @@ module Locomotive
:media => [/^video/, 'application/x-shockwave-flash', 'application/x-swf', /^audio/, 'application/ogg', 'application/x-mp3'], :media => [/^video/, 'application/x-shockwave-flash', 'application/x-swf', /^audio/, 'application/ogg', 'application/x-mp3'],
:pdf => ['application/pdf', 'application/x-pdf'], :pdf => ['application/pdf', 'application/x-pdf'],
:stylesheet => ['text/css'], :stylesheet => ['text/css'],
:javascript => ['text/javascript', 'text/js', 'application/x-javascript', 'application/javascript'], :javascript => ['text/javascript', 'text/js', 'application/x-javascript', 'application/javascript', 'text/x-component'],
:font => ['application/x-font-ttf', 'application/vnd.ms-fontobject', 'image/svg+xml', 'application/x-woff'] :font => ['application/x-font-ttf', 'application/vnd.ms-fontobject', 'image/svg+xml', 'application/x-woff']
} }
end end