1 files changed, 11 insertions, 5 deletions
diff --git a/lib/gitlab/markdown/reference_filter.rb b/lib/gitlab/markdown/reference_filter.rb
index a4303d96bef..a84bacd3d4f 100644
--- a/lib/gitlab/markdown/reference_filter.rb
+++ b/lib/gitlab/markdown/reference_filter.rb
@@ -1,5 +1,5 @@
 require 'active_support/core_ext/string/output_safety'
-require 'html/pipeline'
+require 'html/pipeline/filter'
 
 module Gitlab
   module Markdown
@@ -25,12 +25,18 @@ module Gitlab
         ERB::Util.html_escape_once(html)
       end
 
-      # Don't look for references in text nodes that are children of these
-      # elements.
-      IGNORE_PARENTS = %w(pre code a style).to_set
+      def ignore_parents
+        @ignore_parents ||= begin
+          # Don't look for references in text nodes that are children of these
+          # elements.
+          parents = %w(pre code a style)
+          parents << 'blockquote' if context[:ignore_blockquotes]
+          parents.to_set
+        end
+      end
 
       def ignored_ancestry?(node)
-        has_ancestor?(node, IGNORE_PARENTS)
+        has_ancestor?(node, ignore_parents)
       end
 
       def project