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

Author: tomhughes

lib/rich_text.rb

@@ -98,15 +98,7 @@ def linkify(text, mode = :urls)
     private
 
     def gsub_pairs_for_linkify_detection
-      Array
-        .wrap(Settings.linkify&.detection_rules)
-        .select { |rule| rule.path_template && rule.patterns.is_a?(Array) }
-        .flat_map do |rule|
-          expanded_path = "#{rule.host || "#{Settings.server_protocol}://#{Settings.server_url}"}/#{rule.path_template}"
-          rule.patterns
-              .select { |pattern| pattern.is_a?(String) }
-              .map { |pattern| [Regexp.new("(?<=^|#{URL_UNSAFE_CHARS})#{pattern}", Regexp::IGNORECASE), expanded_path] }
-        end
+      []
     end
 
     def expand_link_shorthands(text)
@@ -279,5 +271,19 @@ def to_html
     def to_text
       to_s
     end
+
+    private
+
+    def gsub_pairs_for_linkify_detection
+      Array
+        .wrap(Settings.linkify&.detection_rules)
+        .select { |rule| rule.path_template && rule.patterns.is_a?(Array) }
+        .flat_map do |rule|
+          expanded_path = "#{rule.host || "#{Settings.server_protocol}://#{Settings.server_url}"}/#{rule.path_template}"
+          rule.patterns
+              .select { |pattern| pattern.is_a?(String) }
+              .map { |pattern| [Regexp.new("(?<=^|#{URL_UNSAFE_CHARS})#{pattern}", Regexp::IGNORECASE), expanded_path] }
+        end
+    end
   end
 end

test/lib/rich_text_test.rb

@@ -491,6 +491,15 @@ def test_text_to_html_linkify_no_year_misinterpretation
     end
   end
 
+  def test_deactivated_linkify_expansion_in_markdown
+    t0 = "foo `surface=metal` bar"
+
+    r1 = RichText.new("markdown", t0)
+    t1 = Nokogiri::HTML.fragment(r1.to_html).text
+
+    assert_equal t0.delete("`"), t1.strip
+  end
+
   def test_text_to_html_email
     r = RichText.new("text", "foo [email protected] bar")
     assert_html r do