Merge branch 'main' into glitch-soc/merge-upstream

2023-07-06 15:16:34 +02:00
parent 30ad9d976b 5e1752ce3f
commit ff7aae3037
17 changed files with 214 additions and 33 deletions
--- a/config/initializers/paperclip.rb
+++ b/config/initializers/paperclip.rb
@ -153,3 +153,10 @@ unless defined?(Seahorse)
    end
  end
 end
+
+# Set our ImageMagick security policy, but allow admins to override it
+ENV['MAGICK_CONFIGURE_PATH'] = begin
+  imagemagick_config_paths = ENV.fetch('MAGICK_CONFIGURE_PATH', '').split(File::PATH_SEPARATOR)
+  imagemagick_config_paths << Rails.root.join('config', 'imagemagick').expand_path.to_s
+  imagemagick_config_paths.join(File::PATH_SEPARATOR)
+end