Merge remote-tracking branch 'origin/master' into dev-master

3 files changed, 18 insertions, 1 deletions

diff --git a/changelogs/unreleased/sh-revert-markdown-changes.yml b/changelogs/unreleased/sh-revert-markdown-changes.yml
new file mode 100644
index 00000000000..72540f710a1
--- /dev/null
+++ b/changelogs/unreleased/sh-revert-markdown-changes.yml
@@ -0,0 +1,5 @@
+---
+title: Fix slow Markdown rendering
+merge_request: 20820
+author:
+type: performance
diff --git a/lib/banzai/filter/sanitization_filter.rb b/lib/banzai/filter/sanitization_filter.rb
index 80b9d3d045f..8ba09290e6d 100644
--- a/lib/banzai/filter/sanitization_filter.rb
+++ b/lib/banzai/filter/sanitization_filter.rb
@@ -13,7 +13,7 @@ module Banzai
 
       def whitelist
         strong_memoize(:whitelist) do
-          customize_whitelist(super.dup)
+          customize_whitelist(super.deep_dup)
         end
       end
 
diff --git a/spec/lib/banzai/filter/sanitization_filter_spec.rb b/spec/lib/banzai/filter/sanitization_filter_spec.rb
index d930c608b18..0b3c2390304 100644
--- a/spec/lib/banzai/filter/sanitization_filter_spec.rb
+++ b/spec/lib/banzai/filter/sanitization_filter_spec.rb
@@ -54,6 +54,18 @@ describe Banzai::Filter::SanitizationFilter do
       expect(instance.whitelist[:transformers].size).to eq control_count
     end
 
+    it 'customizes the whitelist only once for different instances' do
+      instance1 = described_class.new('Foo1')
+      instance2 = described_class.new('Foo2')
+      control_count = instance1.whitelist[:transformers].size
+
+      instance1.whitelist
+      instance2.whitelist
+
+      expect(instance1.whitelist[:transformers].size).to eq control_count
+      expect(instance2.whitelist[:transformers].size).to eq control_count
+    end
+
     it 'sanitizes `class` attribute from all elements' do
       act = %q{<pre class="code highlight white c"><code>&lt;span class="k"&gt;def&lt;/span&gt;</code></pre>}
       exp = %q{<pre><code>&lt;span class="k"&gt;def&lt;/span&gt;</code></pre>}