mirror/blueb-Chuckya-fe-standalone
1
0
Fork 0
mirror of https://iceshrimp.dev/blueb/Chuckya-fe-standalone.git synced 2026-01-11 13:33:21 -08:00
Code Issues Projects Releases Packages Wiki Activity

Merge commit 'd5f02adad7' into glitch-soc/merge-upstream

Browse source 
Conflicts:
- `app/helpers/application_helper.rb`:
  Not a real conflict, just upstream adding a method textually adjacent to
  glitch-soc only code.
  Ported upstream's change.
This commit is contained in:
Claire 2024-06-17 18:30:28 +02:00
commit 395b9011ee
158 changed files with 559 additions and 513 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/initializers/paperclip.rb
View file

@ -72,7 +72,7 @@ if ENV['S3_ENABLED'] == 'true'
}
)
Paperclip::Attachment.default_options[:s3_permissions] = ->(*) { nil } if ENV['S3_PERMISSION'] == ''
Paperclip::Attachment.default_options[:s3_permissions] = ->(*) {} if ENV['S3_PERMISSION'] == ''
if ENV.has_key?('S3_ENDPOINT')
Paperclip::Attachment.default_options[:s3_options].merge!(