Merge branch 'ignore-references' into 'master'

Don't notify users mentioned in code blocks or blockquotes.

cc @rspeicher

See merge request !753

3 files changed, 31 insertions, 39 deletions

diff --git a/lib/gitlab/markdown/reference_filter.rb b/lib/gitlab/markdown/reference_filter.rb
index be4d26af0fc..a84bacd3d4f 100644
--- a/lib/gitlab/markdown/reference_filter.rb
+++ b/lib/gitlab/markdown/reference_filter.rb
@@ -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
diff --git a/lib/gitlab/reference_extractor.rb b/lib/gitlab/reference_extractor.rb
index e35f848fa6e..e836b05ff25 100644
--- a/lib/gitlab/reference_extractor.rb
+++ b/lib/gitlab/reference_extractor.rb
@@ -1,7 +1,7 @@
 module Gitlab
   # Extract possible GFM references from an arbitrary String for further processing.
   class ReferenceExtractor
-    attr_accessor :project, :current_user, :references
+    attr_accessor :project, :current_user
 
     def initialize(project, current_user = nil)
       @project = project
@@ -9,48 +9,31 @@ module Gitlab
     end
 
     def analyze(text)
-      @_text = text.dup
+      references.clear
+      @text = markdown.render(text.dup)
     end
 
-    def users
-      result = pipeline_result(:user)
-      result.uniq
+    %i(user label issue merge_request snippet commit commit_range).each do |type|
+      define_method("#{type}s") do
+        references[type]
+      end
     end
 
-    def labels
-      result = pipeline_result(:label)
-      result.uniq
-    end
-
-    def issues
-      # TODO (rspeicher): What about external issues?
-
-      result = pipeline_result(:issue)
-      result.uniq
-    end
-
-    def merge_requests
-      result = pipeline_result(:merge_request)
-      result.uniq
-    end
+    private
 
-    def snippets
-      result = pipeline_result(:snippet)
-      result.uniq
+    def markdown
+      @markdown ||= Redcarpet::Markdown.new(Redcarpet::Render::HTML, GitlabMarkdownHelper::MARKDOWN_OPTIONS)
     end
 
-    def commits
-      result = pipeline_result(:commit)
-      result.uniq
-    end
+    def references
+      @references ||= Hash.new do |references, type|
+        type = type.to_sym
+        return references[type] if references.has_key?(type)
 
-    def commit_ranges
-      result = pipeline_result(:commit_range)
-      result.uniq
+        references[type] = pipeline_result(type).uniq
+      end
     end
 
-    private
-
     # Instantiate and call HTML::Pipeline with a single reference filter type,
     # returning the result
     #
@@ -65,11 +48,12 @@ module Gitlab
         project: project,
         current_user: current_user,
         # We don't actually care about the links generated
-        only_path: true
+        only_path: true,
+        ignore_blockquotes: true
       }
 
       pipeline = HTML::Pipeline.new([filter], context)
-      result = pipeline.call(@_text)
+      result = pipeline.call(@text)
 
       result[:references][filter_type]
     end
diff --git a/lib/redcarpet/render/gitlab_html.rb b/lib/redcarpet/render/gitlab_html.rb
index 7dcecc2ecf6..2f7aff03c2a 100644
--- a/lib/redcarpet/render/gitlab_html.rb
+++ b/lib/redcarpet/render/gitlab_html.rb
@@ -10,6 +10,8 @@ class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML
     @options = options.dup
 
     @options.reverse_merge!(
+      # Handled further down the line by Gitlab::Markdown::SanitizationFilter
+      escape_html: false,
       project: @template.instance_variable_get("@project")
     )