Commit e393cfd0 by Dave Gynn

fix merge problem on S3 storage

parent 7b4ebdf7
...@@ -153,7 +153,7 @@ module Paperclip ...@@ -153,7 +153,7 @@ module Paperclip
Proc.new do |style, attachment| Proc.new do |style, attachment|
permission = (@s3_permissions[style.to_s.to_sym] || @s3_permissions[:default]) permission = (@s3_permissions[style.to_s.to_sym] || @s3_permissions[:default])
permission = permission.call(attachment, style) if permission.respond_to?(:call) permission = permission.call(attachment, style) if permission.respond_to?(:call)
(permission == DEFAULT_PERMISSIONpublic_read) ? 'http'.freeze : 'https'.freeze (permission == DEFAULT_PERMISSION) ? 'http'.freeze : 'https'.freeze
end end
@s3_metadata = @options[:s3_metadata] || {} @s3_metadata = @options[:s3_metadata] || {}
@s3_headers = {} @s3_headers = {}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment