tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Performance/RedundantMerge cop (#24817)

Browse Source
This commit is contained in:
Matt Jankowski
2023-05-03 23:25:43 -04:00
committed by GitHub
parent b25860c509
commit d9a958fcf7
2 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
config/initializers/paperclip.rb
View File

@ -68,11 +68,7 @@ if ENV['S3_ENABLED'] == 'true'
}
)
if ENV['S3_PERMISSION'] == ''
Paperclip::Attachment.default_options.merge!(
s3_permissions: ->(*) { nil }
)
end
Paperclip::Attachment.default_options[:s3_permissions] = ->(*) { nil } if ENV['S3_PERMISSION'] == ''
if ENV.has_key?('S3_ENDPOINT')
Paperclip::Attachment.default_options[:s3_options].merge!(
@ -90,11 +86,7 @@ if ENV['S3_ENABLED'] == 'true'
)
end
if ENV.has_key?('S3_STORAGE_CLASS')
Paperclip::Attachment.default_options[:s3_headers].merge!(
'X-Amz-Storage-Class' => ENV['S3_STORAGE_CLASS']
)
end
Paperclip::Attachment.default_options[:s3_headers]['X-Amz-Storage-Class'] = ENV['S3_STORAGE_CLASS'] if ENV.has_key?('S3_STORAGE_CLASS')
# Some S3-compatible providers might not actually be compatible with some APIs
# used by kt-paperclip, see https://github.com/mastodon/mastodon/issues/16822