Merge branch 'master' into HEAD

[rails.git] / config / initializers / sanitize.rb

diff --git a/config/initializers/sanitize.rb b/config/initializers/sanitize.rb
index 0df38f0fa87339702ec4ad6425068fcf3998fa1d..d6bd6c3ee780c517ab0325f19279f8a2b82b1b4c 100644 (file)
--- a/config/initializers/sanitize.rb
+++ b/config/initializers/sanitize.rb
@@ -1,4 +1,11 @@
-Sanitize::Config::OSM = Sanitize::Config::RELAXED.dup
-
-Sanitize::Config::OSM[:add_attributes] = { 'a' => { 'rel' => 'nofollow' } }
-Sanitize::Config::OSM[:remove_contents] = [ 'script', 'style' ]
+Sanitize::Config::OSM = Sanitize::Config.merge(
+  Sanitize::Config::RELAXED,
+  :elements => Sanitize::Config::RELAXED[:elements] - %w[div style],
+  :add_attributes => { "a" => { "rel" => "nofollow noopener noreferrer" } },
+  :remove_contents => %w[script style],
+  :transformers => lambda do |env|
+    env[:node].remove_class
+    env[:node].kwattr_remove("style", nil)
+    env[:node].add_class("table table-sm w-auto") if env[:node_name] == "table"
+  end
+)