logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 9d97054fe6ad72da1ef70b0a027bb32cb1fbdfb4
parent: cc796298c9b1c1d2e8b6d36311eb9acc95ab8dc0
Author: Jeong Arm <kjwonmail@gmail.com>
Date:   Tue, 10 Oct 2017 00:52:02 +0900

Remove timestamps on any option (#5282)


Diffstat:

Mconfig/initializers/paperclip.rb3++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb @@ -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'),