Merge remote-tracking branch 'upstream/pull/5401'

[rails.git] / app / controllers / application_controller.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index d46a682151badf37fe1e80b749e8683939609fd8..32b53bad71c3f431d79234d65e354f6cafcf13c9 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -21,7 +21,7 @@ class ApplicationController < ActionController::Base
 
   def self.allow_thirdparty_images(**options)
     content_security_policy(options) do |policy|
 
   def self.allow_thirdparty_images(**options)
     content_security_policy(options) do |policy|

-      policy.img_src("*")
+      policy.img_src("*", :data)

     end
   end
 
     end
   end
 


@@ -279,7 +279,15 @@ class ApplicationController < ActionController::Base
     end
   end
 
     end
   end
 

-  helper_method :preferred_editor
+  def preferred_color_scheme(subject)
+    if current_user
+      current_user.preferences.find_by(:k => "#{subject}.color_scheme")&.v || "auto"
+    else
+      "auto"
+    end
+  end
+
+  helper_method :preferred_editor, :preferred_color_scheme

 
   def update_totp
     if Settings.key?(:totp_key)
 
   def update_totp
     if Settings.key?(:totp_key)