From: Tom Hughes <tom@compton.nu>
Date: Thu, 27 Mar 2025 17:30:12 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/5850'
X-Git-Tag: live~43
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/7a64e03a24ee4465f0c3316f72e1404624e709c7?hp=d04bbae47ac6181c6896545651fa03d70694c439

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

diff --git a/lib/rich_text.rb b/lib/rich_text.rb
index 36e70063f..1147cbc60 100644
--- a/lib/rich_text.rb
+++ b/lib/rich_text.rb
@@ -25,8 +25,6 @@ module RichText
   end
 
   class Base < String
-    include ActionView::Helpers::TagHelper
-
     def spam_score
       link_count = 0
       link_size = 0
@@ -76,7 +74,7 @@ module RichText
     end
 
     def linkify(text, mode = :urls)
-      link_attr = tag_builder.tag_options(:rel => "nofollow noopener noreferrer")
+      link_attr = 'rel="nofollow noopener noreferrer"'
       Rinku.auto_link(ERB::Util.html_escape(text), mode, link_attr) do |url|
         url = shorten_host(url, Settings.linkify_hosts, Settings.linkify_hosts_replacement)
         shorten_host(url, Settings.linkify_wiki_hosts, Settings.linkify_wiki_hosts_replacement)