mirrors
/
glitch-social
mirror of https://github.com/glitch-soc/mastodon
1
0
Fork 0
Code Releases Activity

Remove timestamps on any option (#5282)

This commit is contained in:
Jeong Arm 2017-10-10 00:52:02 +09:00 committed by Eugen Rochko
parent cc796298c9
commit 9d97054fe6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/initializers/paperclip.rb
View File

@ -7,6 +7,8 @@ Paperclip.interpolates :filename do |attachment, style|
[basename(attachment, style), extension(attachment, style)].delete_if(&:blank?).join('.')
end
Paperclip::Attachment.default_options[:use_timestamp] = false
if ENV['S3_ENABLED'] == 'true'
Aws.eager_autoload!(services: %w(S3))
@ -18,7 +20,6 @@ if ENV['S3_ENABLED'] == 'true'
Paperclip::Attachment.default_options[:s3_headers] = { 'Cache-Control' => 'max-age=315576000' }
Paperclip::Attachment.default_options[:s3_permissions] = ENV.fetch('S3_PERMISSION') { 'public-read' }
Paperclip::Attachment.default_options[:s3_region] = ENV.fetch('S3_REGION') { 'us-east-1' }
Paperclip::Attachment.default_options[:use_timestamp] = false
Paperclip::Attachment.default_options[:s3_credentials] = {
bucket: ENV.fetch('S3_BUCKET'),