From ed41333a6ecbfcc04781a47a3dc71064c92d837b Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 14 Oct 2015 19:27:23 +0200
Subject: Use Gitlab::Markdown.render with :pipeline option rather than
 different methods

---
 app/helpers/gitlab_markdown_helper.rb              |  37 +---
 app/views/events/_commit.html.haml                 |   2 +-
 app/views/projects/commit/_commit_box.html.haml    |   4 +-
 app/views/projects/commits/_commit.html.haml       |   2 +-
 app/views/projects/issues/show.html.haml           |   2 +-
 .../projects/merge_requests/show/_mr_box.html.haml |   2 +-
 .../projects/merge_requests/widget/_open.html.haml |   2 +-
 app/views/projects/milestones/show.html.haml       |   2 +-
 app/views/projects/repositories/_feed.html.haml    |   2 +-
 lib/gitlab/markdown.rb                             | 236 ++++++++++-----------
 lib/gitlab/markdown/markdown_filter.rb             |  39 ++++
 lib/gitlab/markdown/relative_link_filter.rb        |   2 +-
 lib/gitlab/markdown/sanitization_filter.rb         |   6 +-
 lib/gitlab/reference_extractor.rb                  |  20 +-
 14 files changed, 181 insertions(+), 177 deletions(-)
 create mode 100644 lib/gitlab/markdown/markdown_filter.rb

diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb
index 65813482120..c6fff1b8ecf 100644
--- a/app/helpers/gitlab_markdown_helper.rb
+++ b/app/helpers/gitlab_markdown_helper.rb
@@ -20,7 +20,7 @@ module GitlabMarkdownHelper
                    end
 
     user = current_user if defined?(current_user)
-    gfm_body = Gitlab::Markdown.gfm(escaped_body, project: @project, current_user: user)
+    gfm_body = Gitlab::Markdown.render(escaped_body, project: @project, current_user: user, pipeline: :single_line)
 
     fragment = Nokogiri::HTML::DocumentFragment.parse(gfm_body)
     if fragment.children.size == 1 && fragment.children[0].name == 'a'
@@ -48,37 +48,20 @@ module GitlabMarkdownHelper
   def markdown(text, context = {})
     return "" unless text.present?
 
-    context.reverse_merge!(
-      path:         @path,
-      pipeline:     :default,
-      project:      @project,
-      project_wiki: @project_wiki,
-      ref:          @ref
-    )
-
-    user = current_user if defined?(current_user)
-
+    context[:project] ||= @project
+    
     html = Gitlab::Markdown.render(text, context)
-    Gitlab::Markdown.post_process(html, pipeline: context[:pipeline], project: @project, user: user)
-  end
 
-  # TODO (rspeicher): Remove all usages of this helper and just call `markdown`
-  # with a custom pipeline depending on the content being rendered
-  def gfm(text, options = {})
-    return "" unless text.present?
+    context.merge!(
+      current_user:   (current_user if defined?(current_user)),
 
-    options.reverse_merge!(
-      path:         @path,
-      pipeline:     :default,
-      project:      @project,
-      project_wiki: @project_wiki,
-      ref:          @ref
+      # RelativeLinkFilter
+      requested_path: @path,
+      project_wiki:   @project_wiki,
+      ref:            @ref
     )
 
-    user = current_user if defined?(current_user)
-
-    html = Gitlab::Markdown.gfm(text, options)
-    Gitlab::Markdown.post_process(html, pipeline: options[:pipeline], project: @project, user: user)
+    Gitlab::Markdown.post_process(html, context)
   end
 
   def asciidoc(text)
diff --git a/app/views/events/_commit.html.haml b/app/views/events/_commit.html.haml
index ad63841ccf3..4ba8b84fd92 100644
--- a/app/views/events/_commit.html.haml
+++ b/app/views/events/_commit.html.haml
@@ -2,4 +2,4 @@
   .commit-row-title
     = link_to truncate_sha(commit[:id]), namespace_project_commit_path(project.namespace, project, commit[:id]), class: "commit_short_id", alt: ''
     &middot;
-    = gfm event_commit_title(commit[:message]), project: project
+    = markdown event_commit_title(commit[:message]), project: project, pipeline: :single_line
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml
index fbf0a9ec0c3..f3be1da8428 100644
--- a/app/views/projects/commit/_commit_box.html.haml
+++ b/app/views/projects/commit/_commit_box.html.haml
@@ -50,10 +50,10 @@
 
 .commit-box.gray-content-block.middle-block
   %h3.commit-title
-    = gfm escape_once(@commit.title)
+    = markdown escape_once(@commit.title), pipeline: :single_line
   - if @commit.description.present?
     %pre.commit-description
-      = preserve(gfm(escape_once(@commit.description)))
+      = preserve(markdown(escape_once(@commit.description), pipeline: :single_line))
 
 :coffeescript
   $(".commit-info-row.branches").load("#{branches_namespace_project_commit_path(@project.namespace, @project, @commit.id)}")
diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml
index cddd5aa3a83..9e0b536bb4b 100644
--- a/app/views/projects/commits/_commit.html.haml
+++ b/app/views/projects/commits/_commit.html.haml
@@ -32,7 +32,7 @@
     - if commit.description?
       .commit-row-description.js-toggle-content
         %pre
-          = preserve(gfm(escape_once(commit.description)))
+          = preserve(markdown(escape_once(commit.description), pipeline: :single_line))
 
     .commit-row-info
       = commit_author_link(commit, avatar: true, size: 24)
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index 5cb814c9ea8..3233c6884cc 100644
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -37,7 +37,7 @@
 
     .gray-content-block.middle-block
       %h2.issue-title
-        = gfm escape_once(@issue.title)
+        = markdown escape_once(@issue.title), pipeline: :single_line
       %div
         - if @issue.description.present?
           .description{class: can?(current_user, :update_issue, @issue) ? 'js-task-list-container' : ''}
diff --git a/app/views/projects/merge_requests/show/_mr_box.html.haml b/app/views/projects/merge_requests/show/_mr_box.html.haml
index b4f62a75890..448230a377c 100644
--- a/app/views/projects/merge_requests/show/_mr_box.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_box.html.haml
@@ -1,6 +1,6 @@
 .gray-content-block.middle-block
   %h2.issue-title
-    = gfm escape_once(@merge_request.title)
+    = markdown escape_once(@merge_request.title), pipeline: :single_line
 
   %div
     - if @merge_request.description.present?
diff --git a/app/views/projects/merge_requests/widget/_open.html.haml b/app/views/projects/merge_requests/widget/_open.html.haml
index 0aad9bb3e88..8629129c0b1 100644
--- a/app/views/projects/merge_requests/widget/_open.html.haml
+++ b/app/views/projects/merge_requests/widget/_open.html.haml
@@ -24,4 +24,4 @@
         %i.fa.fa-check
         Accepting this merge request will close #{"issue".pluralize(@closes_issues.size)}
         = succeed '.' do
-          != gfm(issues_sentence(@closes_issues))
+          != markdown issues_sentence(@closes_issues), pipeline: :gfm
diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml
index 4eeb0621e52..302410765fc 100644
--- a/app/views/projects/milestones/show.html.haml
+++ b/app/views/projects/milestones/show.html.haml
@@ -31,7 +31,7 @@
     %span All issues for this milestone are closed. You may close milestone now.
 
 %h3.issue-title
-  = gfm escape_once(@milestone.title)
+  = markdown escape_once(@milestone.title), pipeline: :single_line
 %div
   - if @milestone.description.present?
     .description
diff --git a/app/views/projects/repositories/_feed.html.haml b/app/views/projects/repositories/_feed.html.haml
index f3526ad0747..6ca919f7f80 100644
--- a/app/views/projects/repositories/_feed.html.haml
+++ b/app/views/projects/repositories/_feed.html.haml
@@ -12,7 +12,7 @@
       = link_to namespace_project_commits_path(@project.namespace, @project, commit.id) do
         %code= commit.short_id
       = image_tag avatar_icon(commit.author_email), class: "", width: 16, alt: ''
-      = gfm escape_once(truncate(commit.title, length: 40))
+      = markdown escape_once(truncate(commit.title, length: 40)), pipeline: :single_line
   %td
     %span.pull-right.cgray
       = time_ago_with_tooltip(commit.committed_date)
diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb
index d5b0060dd56..773ebddba2b 100644
--- a/lib/gitlab/markdown.rb
+++ b/lib/gitlab/markdown.rb
@@ -19,51 +19,15 @@ module Gitlab
     # context  - Hash of context options passed to our HTML Pipeline
     #
     # Returns an HTML-safe String
-    def self.render(markdown, context = {})
-      html = renderer.render(markdown)
-      html = gfm(html, context)
+    def self.render(text, context = {})
+      pipeline = context[:pipeline] || :full
 
-      html.html_safe
-    end
+      html_pipeline = html_pipelines[pipeline]
 
-    # Convert a Markdown String into HTML without going through the HTML
-    # Pipeline.
-    #
-    # Note that because the pipeline is skipped, SanitizationFilter is as well.
-    # Do not output the result of this method to the user.
-    #
-    # markdown - Markdown String
-    #
-    # Returns a String
-    def self.render_without_gfm(markdown)
-      renderer.render(markdown)
-    end
+      transformers = get_context_transformers(pipeline)
+      context = transformers.reduce(context) { |context, transformer| transformer.call(context) }
 
-    # Perform post-processing on an HTML String
-    #
-    # This method is used to perform state-dependent changes to a String of
-    # HTML, such as removing references that the current user doesn't have
-    # permission to make (`RedactorFilter`).
-    #
-    # html     - String to process
-    # options  - Hash of options to customize output
-    #            :pipeline  - Symbol pipeline type
-    #            :project   - Project
-    #            :user      - User object
-    #
-    # Returns an HTML-safe String
-    def self.post_process(html, options)
-      context = {
-        project:      options[:project],
-        current_user: options[:user]
-      }
-      doc = post_processor.to_document(html, context)
-
-      if options[:pipeline] == :atom
-        doc.to_html(save_with: Nokogiri::XML::Node::SaveOptions::AS_XHTML)
-      else
-        doc.to_html
-      end.html_safe
+      html_pipeline.to_html(text, context)
     end
 
     # Provide autoload paths for filters to prevent a circular dependency error
@@ -75,6 +39,7 @@ module Gitlab
     autoload :ExternalLinkFilter,           'gitlab/markdown/external_link_filter'
     autoload :IssueReferenceFilter,         'gitlab/markdown/issue_reference_filter'
     autoload :LabelReferenceFilter,         'gitlab/markdown/label_reference_filter'
+    autoload :MarkdownFilter,               'gitlab/markdown/markdown_filter'
     autoload :MergeRequestReferenceFilter,  'gitlab/markdown/merge_request_reference_filter'
     autoload :RedactorFilter,               'gitlab/markdown/redactor_filter'
     autoload :RelativeLinkFilter,           'gitlab/markdown/relative_link_filter'
@@ -85,98 +50,38 @@ module Gitlab
     autoload :TaskListFilter,               'gitlab/markdown/task_list_filter'
     autoload :UserReferenceFilter,          'gitlab/markdown/user_reference_filter'
 
-    # Public: Parse the provided HTML with GitLab-Flavored Markdown
+    # Perform post-processing on an HTML String
+    #
+    # This method is used to perform state-dependent changes to a String of
+    # HTML, such as removing references that the current user doesn't have
+    # permission to make (`RedactorFilter`).
     #
-    # html    - HTML String
-    # options - A Hash of options used to customize output (default: {})
-    #           :no_header_anchors - Disable header anchors in TableOfContentsFilter
-    #           :path              - Current path String
-    #           :pipeline          - Symbol pipeline type
-    #           :project           - Current Project object
-    #           :project_wiki      - Current ProjectWiki object
-    #           :ref               - Current ref String
+    # html     - String to process
+    # context  - Hash of options to customize output
+    #            :pipeline  - Symbol pipeline type
+    #            :project   - Project
+    #            :user      - User object
     #
     # Returns an HTML-safe String
-    def self.gfm(html, options = {})
-      return '' unless html.present?
-
-      @pipeline ||= HTML::Pipeline.new(filters)
-
-      context = {
-        # SanitizationFilter
-        pipeline: options[:pipeline],
-
-        # EmojiFilter
-        asset_host: Gitlab::Application.config.asset_host,
-        asset_root: Gitlab.config.gitlab.base_url,
-
-        # ReferenceFilter
-        only_path: only_path_pipeline?(options[:pipeline]),
-        project:   options[:project],
-
-        # RelativeLinkFilter
-        project_wiki:   options[:project_wiki],
-        ref:            options[:ref],
-        requested_path: options[:path],
-
-        # TableOfContentsFilter
-        no_header_anchors: options[:no_header_anchors]
-      }
+    def self.post_process(html, context)
+      doc = html_pipelines[:post_process].to_document(html, context)
 
-      @pipeline.to_html(html, context).html_safe
-    end
-
-    private
-
-    # Check if a pipeline enables the `only_path` context option
-    #
-    # Returns Boolean
-    def self.only_path_pipeline?(pipeline)
-      case pipeline
-      when :atom, :email
-        false
+      if context[:xhtml]
+        doc.to_html(save_with: Nokogiri::XML::Node::SaveOptions::AS_XHTML)
       else
-        true
-      end
-    end
-
-    def self.redcarpet_options
-      # https://github.com/vmg/redcarpet#and-its-like-really-simple-to-use
-      @redcarpet_options ||= {
-        fenced_code_blocks:  true,
-        footnotes:           true,
-        lax_spacing:         true,
-        no_intra_emphasis:   true,
-        space_after_headers: true,
-        strikethrough:       true,
-        superscript:         true,
-        tables:              true
-      }.freeze
-    end
-
-    def self.renderer
-      @markdown ||= begin
-        renderer = Redcarpet::Render::HTML.new
-        Redcarpet::Markdown.new(renderer, redcarpet_options)
-      end
-    end
-
-    def self.post_processor
-      @post_processor ||= HTML::Pipeline.new([Gitlab::Markdown::RedactorFilter])
+        doc.to_html
+      end.html_safe
     end
 
-    # Filters used in our pipeline
-    #
-    # SanitizationFilter should come first so that all generated reference HTML
-    # goes through untouched.
-    #
-    # See https://github.com/jch/html-pipeline#filters for more filters.
-    def self.filters
-      [
+    private
+    FILTERS = {
+      plain_markdown: [
+        Gitlab::Markdown::MarkdownFilter
+      ],
+      gfm: [
         Gitlab::Markdown::SyntaxHighlightFilter,
         Gitlab::Markdown::SanitizationFilter,
 
-        Gitlab::Markdown::RelativeLinkFilter,
         Gitlab::Markdown::EmojiFilter,
         Gitlab::Markdown::TableOfContentsFilter,
         Gitlab::Markdown::AutolinkFilter,
@@ -192,7 +97,90 @@ module Gitlab
         Gitlab::Markdown::LabelReferenceFilter,
 
         Gitlab::Markdown::TaskListFilter
+      ],
+
+      full:           [:plain_markdown, :gfm],
+      atom:           :full,
+      email:          :full,
+      description:    :full,
+      single_line:    :gfm,
+
+      post_process: [
+        Gitlab::Markdown::RelativeLinkFilter, 
+        Gitlab::Markdown::RedactorFilter
       ]
+    }
+
+    CONTEXT_TRANSFORMERS = {
+      gfm: {
+        only_path: true,
+
+        # EmojiFilter
+        asset_host: Gitlab::Application.config.asset_host,
+        asset_root: Gitlab.config.gitlab.base_url
+      },
+      full: :gfm,
+
+      atom: [
+        :full, 
+        { 
+          only_path: false, 
+          xhtml: true 
+        }
+      ],
+      email: [
+        :full,
+        { 
+          only_path: false 
+        }
+      ],
+      description: [
+        :full,
+        { 
+          # SanitizationFilter
+          inline_sanitization: true
+        }
+      ],
+      single_line: :gfm,
+
+      post_process: {
+        post_process: true
+      }
+    }
+
+    def self.html_pipelines
+      @html_pipelines ||= Hash.new do |hash, pipeline|
+        filters = get_filters(pipeline)
+        HTML::Pipeline.new(filters)
+      end
+    end
+
+    def self.get_filters(pipelines)
+      Array.wrap(pipelines).flat_map do |pipeline|
+        case pipeline
+        when Class
+          pipeline
+        when Symbol
+          get_filters(FILTERS[pipeline])
+        when Array
+          get_filters(pipeline)
+        end
+      end.compact
+    end
+
+    def self.get_context_transformers(pipelines)
+      Array.wrap(pipelines).flat_map do |pipeline|
+        case pipeline
+        when Hash
+          ->(context) { context.merge(pipeline) }
+        when Proc
+          pipeline
+        when Symbol
+          get_context_transformers(CONTEXT_TRANSFORMERS[pipeline])
+        when Array
+          get_context_transformers(pipeline)
+        end
+      end.compact
     end
   end
 end
diff --git a/lib/gitlab/markdown/markdown_filter.rb b/lib/gitlab/markdown/markdown_filter.rb
new file mode 100644
index 00000000000..921e2a0794e
--- /dev/null
+++ b/lib/gitlab/markdown/markdown_filter.rb
@@ -0,0 +1,39 @@
+module Gitlab
+  module Markdown
+    class MarkdownFilter < HTML::Pipeline::TextFilter
+      def initialize(text, context = nil, result = nil)
+        super text, context, result
+        @text = @text.gsub "\r", ''
+      end
+
+      def call
+        html = self.class.renderer.render(@text)
+        html.rstrip!
+        html
+      end
+  
+      private      
+
+      def self.redcarpet_options
+        # https://github.com/vmg/redcarpet#and-its-like-really-simple-to-use
+        @redcarpet_options ||= {
+          fenced_code_blocks:  true,
+          footnotes:           true,
+          lax_spacing:         true,
+          no_intra_emphasis:   true,
+          space_after_headers: true,
+          strikethrough:       true,
+          superscript:         true,
+          tables:              true
+        }.freeze
+      end
+
+      def self.renderer
+        @renderer ||= begin
+          renderer = Redcarpet::Render::HTML.new
+          Redcarpet::Markdown.new(renderer, redcarpet_options)
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/relative_link_filter.rb b/lib/gitlab/markdown/relative_link_filter.rb
index 6ee3d1ce039..3e9909d2f33 100644
--- a/lib/gitlab/markdown/relative_link_filter.rb
+++ b/lib/gitlab/markdown/relative_link_filter.rb
@@ -16,7 +16,7 @@ module Gitlab
       def call
         return doc unless linkable_files?
 
-        doc.search('a').each do |el|
+        doc.search('a:not(.gfm)').each do |el|
           process_link_attr el.attribute('href')
         end
 
diff --git a/lib/gitlab/markdown/sanitization_filter.rb b/lib/gitlab/markdown/sanitization_filter.rb
index e368de7d848..550dfafca85 100644
--- a/lib/gitlab/markdown/sanitization_filter.rb
+++ b/lib/gitlab/markdown/sanitization_filter.rb
@@ -11,7 +11,7 @@ module Gitlab
       def whitelist
         # Descriptions are more heavily sanitized, allowing only a few elements.
         # See http://git.io/vkuAN
-        if pipeline == :description
+        if context[:inline_sanitization]
           whitelist = LIMITED
           whitelist[:elements] -= %w(pre code img ol ul li)
         else
@@ -25,10 +25,6 @@ module Gitlab
 
       private
 
-      def pipeline
-        context[:pipeline] || :default
-      end
-
       def customized?(transformers)
         transformers.last.source_location[0] == __FILE__
       end
diff --git a/lib/gitlab/reference_extractor.rb b/lib/gitlab/reference_extractor.rb
index 66016ecc877..633c988d025 100644
--- a/lib/gitlab/reference_extractor.rb
+++ b/lib/gitlab/reference_extractor.rb
@@ -13,7 +13,8 @@ module Gitlab
 
     def analyze(text)
       references.clear
-      @text = Gitlab::Markdown.render_without_gfm(text)
+
+      @document = Gitlab::Markdown.render(text, project: project)
     end
 
     %i(user label issue merge_request snippet commit commit_range).each do |type|
@@ -44,20 +45,13 @@ module Gitlab
       filter = Gitlab::Markdown.const_get(klass)
 
       context = {
-        project: project,
-        current_user: current_user,
-        
-        # We don't actually care about the links generated
-        only_path: true,
-        ignore_blockquotes: true,
-
-        # ReferenceGathererFilter
+        project:              project,
+        current_user:         current_user,
         load_lazy_references: false,
         reference_filter:     filter
       }
 
-      pipeline = HTML::Pipeline.new([filter, Gitlab::Markdown::ReferenceGathererFilter], context)
-      result = pipeline.call(@text)
+      result = self.class.pipeline.call(@document, context)
 
       values = result[:references][filter_type].uniq
 
@@ -67,5 +61,9 @@ module Gitlab
 
       values
     end
+
+    def self.pipeline
+      @pipeline ||= HTML::Pipeline.new([Gitlab::Markdown::ReferenceGathererFilter])
+    end
   end
 end
-- 
cgit v1.2.1


From da9746e59a46005a0948d34bfd94ae715143c3f7 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 14 Oct 2015 19:28:46 +0200
Subject: Enable caching of Gitlab::Markdown rendered result

---
 lib/gitlab/markdown.rb            | 35 +++++++++++++++++++++++++----------
 lib/gitlab/reference_extractor.rb |  4 ++--
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb
index 773ebddba2b..21416f0fa02 100644
--- a/lib/gitlab/markdown.rb
+++ b/lib/gitlab/markdown.rb
@@ -20,14 +20,16 @@ module Gitlab
     #
     # Returns an HTML-safe String
     def self.render(text, context = {})
-      pipeline = context[:pipeline] || :full
-
-      html_pipeline = html_pipelines[pipeline]
-
-      transformers = get_context_transformers(pipeline)
-      context = transformers.reduce(context) { |context, transformer| transformer.call(context) }
+      cache_key = context.delete(:cache_key)
 
-      html_pipeline.to_html(text, context)
+      if cache_key
+        cache_key = full_cache_key(cache_key, context[:pipeline])
+        Rails.cache.fetch(cache_key) do
+          cacheless_render(text, context)
+        end
+      else
+        cacheless_render(text, context)
+      end
     end
 
     # Provide autoload paths for filters to prevent a circular dependency error
@@ -130,9 +132,7 @@ module Gitlab
       ],
       email: [
         :full,
-        { 
-          only_path: false 
-        }
+        { only_path: false }
       ],
       description: [
         :full,
@@ -155,6 +155,17 @@ module Gitlab
       end
     end
 
+    def self.cacheless_render(text, context = {})
+      pipeline = context[:pipeline] || :full
+
+      html_pipeline = html_pipelines[pipeline]
+
+      transformers = get_context_transformers(pipeline)
+      context = transformers.reduce(context) { |context, transformer| transformer.call(context) }
+
+      html_pipeline.to_html(text, context)
+    end
+
     def self.get_filters(pipelines)
       Array.wrap(pipelines).flat_map do |pipeline|
         case pipeline
@@ -182,5 +193,9 @@ module Gitlab
         end
       end.compact
     end
+
+    def self.full_cache_key(cache_key, pipeline = :full)
+      ["markdown", *cache_key, pipeline]
+    end
   end
 end
diff --git a/lib/gitlab/reference_extractor.rb b/lib/gitlab/reference_extractor.rb
index 633c988d025..2262e5a168a 100644
--- a/lib/gitlab/reference_extractor.rb
+++ b/lib/gitlab/reference_extractor.rb
@@ -11,10 +11,10 @@ module Gitlab
       @load_lazy_references = load_lazy_references
     end
 
-    def analyze(text)
+    def analyze(text, cache_key: nil)
       references.clear
 
-      @document = Gitlab::Markdown.render(text, project: project)
+      @document = Gitlab::Markdown.render(text, project: project, cache_key: cache_key)
     end
 
     %i(user label issue merge_request snippet commit commit_range).each do |type|
-- 
cgit v1.2.1


From b093cb35d1614a48e980c5ccfca3a8d307d732f7 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 14 Oct 2015 20:18:49 +0200
Subject: Use Gitlab::Markdown for Asciidoc and ReferenceExtractor pipelines

---
 app/helpers/gitlab_markdown_helper.rb |  15 ++-
 lib/gitlab/asciidoc.rb                |  27 +---
 lib/gitlab/markdown.rb                | 226 +++++++++++++++++++++-------------
 lib/gitlab/reference_extractor.rb     |  18 +--
 spec/lib/gitlab/asciidoc_spec.rb      |   6 +-
 5 files changed, 166 insertions(+), 126 deletions(-)

diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb
index c6fff1b8ecf..2f933f4d695 100644
--- a/app/helpers/gitlab_markdown_helper.rb
+++ b/app/helpers/gitlab_markdown_helper.rb
@@ -65,13 +65,16 @@ module GitlabMarkdownHelper
   end
 
   def asciidoc(text)
-    Gitlab::Asciidoc.render(text, {
-      commit: @commit,
-      project: @project,
-      project_wiki: @project_wiki,
+    Gitlab::Asciidoc.render(text,
+      project:      @project,
+      current_user: (current_user if defined?(current_user)),
+
+      # RelativeLinkFilter
+      project_wiki:   @project_wiki,
       requested_path: @path,
-      ref: @ref
-    })
+      ref:            @ref,
+      commit:         @commit
+    )
   end
 
   # Return the first line of +text+, up to +max_chars+, after parsing the line
diff --git a/lib/gitlab/asciidoc.rb b/lib/gitlab/asciidoc.rb
index bf33e5b1b1e..330d3342dd1 100644
--- a/lib/gitlab/asciidoc.rb
+++ b/lib/gitlab/asciidoc.rb
@@ -1,14 +1,10 @@
 require 'asciidoctor'
-require 'html/pipeline'
 
 module Gitlab
   # Parser/renderer for the AsciiDoc format that uses Asciidoctor and filters
   # the resulting HTML through HTML pipeline filters.
   module Asciidoc
 
-    # Provide autoload paths for filters to prevent a circular dependency error
-    autoload :RelativeLinkFilter, 'gitlab/markdown/relative_link_filter'
-
     DEFAULT_ADOC_ATTRS = [
       'showtitle', 'idprefix=user-content-', 'idseparator=-', 'env=gitlab',
       'env-gitlab', 'source-highlighter=html-pipeline'
@@ -24,13 +20,11 @@ module Gitlab
     #                 :requested_path
     #                 :ref
     # asciidoc_opts - a Hash of options to pass to the Asciidoctor converter
-    # html_opts     - a Hash of options for HTML output:
-    #                 :xhtml - output XHTML instead of HTML
     #
-    def self.render(input, context, asciidoc_opts = {}, html_opts = {})
-      asciidoc_opts = asciidoc_opts.reverse_merge(
+    def self.render(input, context, asciidoc_opts = {})
+      asciidoc_opts.reverse_merge!(
         safe: :secure,
-        backend: html_opts[:xhtml] ? :xhtml5 : :html5,
+        backend: :html5,
         attributes: []
       )
       asciidoc_opts[:attributes].unshift(*DEFAULT_ADOC_ATTRS)
@@ -38,23 +32,10 @@ module Gitlab
       html = ::Asciidoctor.convert(input, asciidoc_opts)
 
       if context[:project]
-        result = HTML::Pipeline.new(filters).call(html, context)
-
-        save_opts = html_opts[:xhtml] ?
-          Nokogiri::XML::Node::SaveOptions::AS_XHTML : 0
-
-        html = result[:output].to_html(save_with: save_opts)
+        html = Gitlab::Markdown.render(html, context.merge(pipeline: :asciidoc))
       end
 
       html.html_safe
     end
-
-    private
-
-    def self.filters
-      [
-        Gitlab::Markdown::RelativeLinkFilter
-      ]
-    end
   end
 end
diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb
index 21416f0fa02..dc6751fa1c2 100644
--- a/lib/gitlab/markdown.rb
+++ b/lib/gitlab/markdown.rb
@@ -21,9 +21,9 @@ module Gitlab
     # Returns an HTML-safe String
     def self.render(text, context = {})
       cache_key = context.delete(:cache_key)
+      cache_key = full_cache_key(cache_key, context[:pipeline])
 
       if cache_key
-        cache_key = full_cache_key(cache_key, context[:pipeline])
         Rails.cache.fetch(cache_key) do
           cacheless_render(text, context)
         end
@@ -32,25 +32,21 @@ module Gitlab
       end
     end
 
-    # Provide autoload paths for filters to prevent a circular dependency error
-    autoload :AutolinkFilter,               'gitlab/markdown/autolink_filter'
-    autoload :CommitRangeReferenceFilter,   'gitlab/markdown/commit_range_reference_filter'
-    autoload :CommitReferenceFilter,        'gitlab/markdown/commit_reference_filter'
-    autoload :EmojiFilter,                  'gitlab/markdown/emoji_filter'
-    autoload :ExternalIssueReferenceFilter, 'gitlab/markdown/external_issue_reference_filter'
-    autoload :ExternalLinkFilter,           'gitlab/markdown/external_link_filter'
-    autoload :IssueReferenceFilter,         'gitlab/markdown/issue_reference_filter'
-    autoload :LabelReferenceFilter,         'gitlab/markdown/label_reference_filter'
-    autoload :MarkdownFilter,               'gitlab/markdown/markdown_filter'
-    autoload :MergeRequestReferenceFilter,  'gitlab/markdown/merge_request_reference_filter'
-    autoload :RedactorFilter,               'gitlab/markdown/redactor_filter'
-    autoload :RelativeLinkFilter,           'gitlab/markdown/relative_link_filter'
-    autoload :SanitizationFilter,           'gitlab/markdown/sanitization_filter'
-    autoload :SnippetReferenceFilter,       'gitlab/markdown/snippet_reference_filter'
-    autoload :SyntaxHighlightFilter,        'gitlab/markdown/syntax_highlight_filter'
-    autoload :TableOfContentsFilter,        'gitlab/markdown/table_of_contents_filter'
-    autoload :TaskListFilter,               'gitlab/markdown/task_list_filter'
-    autoload :UserReferenceFilter,          'gitlab/markdown/user_reference_filter'
+    def self.render_result(text, context = {})
+      pipeline = context[:pipeline] || :full
+
+      html_pipeline = html_pipelines[pipeline]
+
+      transformers = context_transformers[pipeline]
+      context = transformers.reduce(context) { |context, transformer| transformer.call(context) }
+
+      html_pipeline.call(text, context)
+    end
+
+    def self.cached?(cache_key, pipeline: :full)
+      cache_key = full_cache_key(cache_key, pipeline)
+      cache_key ? Rails.cache.exist?(cache_key) : false
+    end
 
     # Perform post-processing on an HTML String
     #
@@ -66,21 +62,39 @@ module Gitlab
     #
     # Returns an HTML-safe String
     def self.post_process(html, context)
-      doc = html_pipelines[:post_process].to_document(html, context)
+      html_pipeline = html_pipelines[:post_process]
 
       if context[:xhtml]
-        doc.to_html(save_with: Nokogiri::XML::Node::SaveOptions::AS_XHTML)
+        html_pipeline.to_document(html, context).to_html(save_with: Nokogiri::XML::Node::SaveOptions::AS_XHTML)
       else
-        doc.to_html
+        html_pipeline.to_html(html, context)
       end.html_safe
     end
 
     private
-    FILTERS = {
-      plain_markdown: [
-        Gitlab::Markdown::MarkdownFilter
-      ],
-      gfm: [
+
+    # Provide autoload paths for filters to prevent a circular dependency error
+    autoload :AutolinkFilter,               'gitlab/markdown/autolink_filter'
+    autoload :CommitRangeReferenceFilter,   'gitlab/markdown/commit_range_reference_filter'
+    autoload :CommitReferenceFilter,        'gitlab/markdown/commit_reference_filter'
+    autoload :EmojiFilter,                  'gitlab/markdown/emoji_filter'
+    autoload :ExternalIssueReferenceFilter, 'gitlab/markdown/external_issue_reference_filter'
+    autoload :ExternalLinkFilter,           'gitlab/markdown/external_link_filter'
+    autoload :IssueReferenceFilter,         'gitlab/markdown/issue_reference_filter'
+    autoload :LabelReferenceFilter,         'gitlab/markdown/label_reference_filter'
+    autoload :MarkdownFilter,               'gitlab/markdown/markdown_filter'
+    autoload :MergeRequestReferenceFilter,  'gitlab/markdown/merge_request_reference_filter'
+    autoload :RedactorFilter,               'gitlab/markdown/redactor_filter'
+    autoload :RelativeLinkFilter,           'gitlab/markdown/relative_link_filter'
+    autoload :SanitizationFilter,           'gitlab/markdown/sanitization_filter'
+    autoload :SnippetReferenceFilter,       'gitlab/markdown/snippet_reference_filter'
+    autoload :SyntaxHighlightFilter,        'gitlab/markdown/syntax_highlight_filter'
+    autoload :TableOfContentsFilter,        'gitlab/markdown/table_of_contents_filter'
+    autoload :TaskListFilter,               'gitlab/markdown/task_list_filter'
+    autoload :UserReferenceFilter,          'gitlab/markdown/user_reference_filter'
+
+    def self.gfm_filters
+      @gfm_filters ||= [
         Gitlab::Markdown::SyntaxHighlightFilter,
         Gitlab::Markdown::SanitizationFilter,
 
@@ -99,71 +113,99 @@ module Gitlab
         Gitlab::Markdown::LabelReferenceFilter,
 
         Gitlab::Markdown::TaskListFilter
-      ],
+      ]
+    end
 
-      full:           [:plain_markdown, :gfm],
-      atom:           :full,
-      email:          :full,
-      description:    :full,
-      single_line:    :gfm,
+    def self.all_filters
+      @all_filters ||= {
+        plain_markdown: [
+          Gitlab::Markdown::MarkdownFilter
+        ],
+        gfm: gfm_filters,
+
+        full:           [:plain_markdown, :gfm],
+        atom:           :full,
+        email:          :full,
+        description:    :full,
+        single_line:    :gfm,
+
+        asciidoc: [
+          Gitlab::Markdown::RelativeLinkFilter
+        ],
+
+        post_process: [
+          Gitlab::Markdown::RelativeLinkFilter, 
+          Gitlab::Markdown::RedactorFilter
+        ],
+
+        reference_extraction: [
+          Gitlab::Markdown::ReferenceGathererFilter
+        ]
+      }
+    end
 
-      post_process: [
-        Gitlab::Markdown::RelativeLinkFilter, 
-        Gitlab::Markdown::RedactorFilter
-      ]
-    }
-
-    CONTEXT_TRANSFORMERS = {
-      gfm: {
-        only_path: true,
-
-        # EmojiFilter
-        asset_host: Gitlab::Application.config.asset_host,
-        asset_root: Gitlab.config.gitlab.base_url
-      },
-      full: :gfm,
-
-      atom: [
-        :full, 
-        { 
-          only_path: false, 
-          xhtml: true 
-        }
-      ],
-      email: [
-        :full,
-        { only_path: false }
-      ],
-      description: [
-        :full,
-        { 
-          # SanitizationFilter
-          inline_sanitization: true
+    def self.all_context_transformers
+      @all_context_transformers ||= {
+        gfm: {
+          only_path: true,
+
+          # EmojiFilter
+          asset_host: Gitlab::Application.config.asset_host,
+          asset_root: Gitlab.config.gitlab.base_url
+        },
+        full: :gfm,
+
+        atom: [
+          :full, 
+          { 
+            only_path: false, 
+            xhtml: true 
+          }
+        ],
+        email: [
+          :full,
+          { 
+            only_path: false
+          }
+        ],
+        description: [
+          :full,
+          { 
+            # SanitizationFilter
+            inline_sanitization: true
+          }
+        ],
+        single_line: :gfm,
+
+        post_process: {
+          post_process: true
         }
-      ],
-      single_line: :gfm,
-
-      post_process: {
-        post_process: true
       }
-    }
+    end
+
+    def self.html_filters
+      @html_filters ||= Hash.new do |hash, pipeline|
+        filters = get_filters(pipeline)
+        hash[pipeline] = filters if pipeline.is_a?(Symbol)
+        filters
+      end
+    end
 
     def self.html_pipelines
       @html_pipelines ||= Hash.new do |hash, pipeline|
         filters = get_filters(pipeline)
-        HTML::Pipeline.new(filters)
+        html_pipeline = HTML::Pipeline.new(filters)
+        hash[pipeline] = html_pipeline if pipeline.is_a?(Symbol)
+        html_pipeline
       end
     end
 
-    def self.cacheless_render(text, context = {})
-      pipeline = context[:pipeline] || :full
-
-      html_pipeline = html_pipelines[pipeline]
-
-      transformers = get_context_transformers(pipeline)
-      context = transformers.reduce(context) { |context, transformer| transformer.call(context) }
-
-      html_pipeline.to_html(text, context)
+    def self.context_transformers
+      @context_transformers ||= Hash.new do |hash, pipeline|
+        transformers = get_context_transformers(pipeline)
+        hash[pipeline] = transformers if pipeline.is_a?(Symbol)
+        transformers
+      end
     end
 
     def self.get_filters(pipelines)
@@ -172,9 +214,9 @@ module Gitlab
         when Class
           pipeline
         when Symbol
-          get_filters(FILTERS[pipeline])
+          html_filters[all_filters[pipeline]]
         when Array
-          get_filters(pipeline)
+          html_filters[pipeline]
         end
       end.compact
     end
@@ -187,14 +229,26 @@ module Gitlab
         when Proc
           pipeline
         when Symbol
-          get_context_transformers(CONTEXT_TRANSFORMERS[pipeline])
+          context_transformers[all_context_transformers[pipeline]]
         when Array
-          get_context_transformers(pipeline)
+          context_transformers[pipeline]
         end
       end.compact
     end
 
+    def self.cacheless_render(text, context = {})
+      result = render_result(text, context)
+      output = result[:output]
+      if output.respond_to?(:to_html)
+        output.to_html
+      else
+        output.to_s
+      end
+    end
+
     def self.full_cache_key(cache_key, pipeline = :full)
+      return unless cache_key && pipeline.is_a?(Symbol)
+
       ["markdown", *cache_key, pipeline]
     end
   end
diff --git a/lib/gitlab/reference_extractor.rb b/lib/gitlab/reference_extractor.rb
index 2262e5a168a..f34bf7d1d0e 100644
--- a/lib/gitlab/reference_extractor.rb
+++ b/lib/gitlab/reference_extractor.rb
@@ -14,7 +14,8 @@ module Gitlab
     def analyze(text, cache_key: nil)
       references.clear
 
-      @document = Gitlab::Markdown.render(text, project: project, cache_key: cache_key)
+      @pipeline = Gitlab::Markdown.cached?(cache_key, pipeline: :full) ? :full : :plain_markdown
+      @html = Gitlab::Markdown.render(text, project: project, cache_key: cache_key, pipeline: @pipeline)
     end
 
     %i(user label issue merge_request snippet commit commit_range).each do |type|
@@ -45,14 +46,19 @@ module Gitlab
       filter = Gitlab::Markdown.const_get(klass)
 
       context = {
-        project:              project,
-        current_user:         current_user,
+        pipeline: [:reference_extraction],
+
+        project:      project,
+        current_user: current_user,
+
+        # ReferenceGathererFilter
         load_lazy_references: false,
         reference_filter:     filter
       }
 
-      result = self.class.pipeline.call(@document, context)
+      context[:pipeline].unshift(filter) unless @pipeline == :full
 
+      result = Gitlab::Markdown.render_result(@html, context)
       values = result[:references][filter_type].uniq
 
       if @load_lazy_references
@@ -61,9 +67,5 @@ module Gitlab
 
       values
     end
-
-    def self.pipeline
-      @pipeline ||= HTML::Pipeline.new([Gitlab::Markdown::ReferenceGathererFilter])
-    end
   end
 end
diff --git a/spec/lib/gitlab/asciidoc_spec.rb b/spec/lib/gitlab/asciidoc_spec.rb
index 03e36fd3552..e8c8180e1c4 100644
--- a/spec/lib/gitlab/asciidoc_spec.rb
+++ b/spec/lib/gitlab/asciidoc_spec.rb
@@ -50,9 +50,9 @@ module Gitlab
         filtered_html = '<b>ASCII</b>'
 
         allow(Asciidoctor).to receive(:convert).and_return(html)
-        expect_any_instance_of(HTML::Pipeline).to receive(:call)
-          .with(html, context)
-          .and_return(output: Nokogiri::HTML.fragment(filtered_html))
+        expect(Gitlab::Markdown).to receive(:render)
+          .with(html, context.merge(pipeline: :asciidoc))
+          .and_return(filtered_html)
 
         expect( render('foo', context) ).to eql filtered_html
       end
-- 
cgit v1.2.1


From 925dc5925b672718ea1f0f08c5bdd492b5ab3e5d Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 14 Oct 2015 21:29:35 +0200
Subject: Cache rendered contents of issues, MRs and notes

---
 app/models/concerns/issuable.rb                    |  3 +-
 app/models/concerns/mentionable.rb                 | 39 +++++++++++++---------
 app/models/note.rb                                 |  2 +-
 app/views/projects/issues/show.html.haml           |  2 +-
 .../projects/merge_requests/show/_mr_box.html.haml |  2 +-
 app/views/projects/notes/_note.html.haml           |  2 +-
 lib/gitlab/markdown.rb                             | 12 ++++++-
 lib/gitlab/reference_extractor.rb                  | 20 +++++------
 8 files changed, 51 insertions(+), 31 deletions(-)

diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index feee8460b86..e260eae8a43 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -46,7 +46,8 @@ module Issuable
              allow_nil: true,
              prefix: true
 
-    attr_mentionable :title, :description
+    attr_mentionable :title 
+    attr_mentionable :description, cache: true
     participant :author, :assignee, :notes
   end
 
diff --git a/app/models/concerns/mentionable.rb b/app/models/concerns/mentionable.rb
index 715fc6f689d..ad432144bd9 100644
--- a/app/models/concerns/mentionable.rb
+++ b/app/models/concerns/mentionable.rb
@@ -10,8 +10,9 @@ module Mentionable
 
   module ClassMethods
     # Indicate which attributes of the Mentionable to search for GFM references.
-    def attr_mentionable(*attrs)
-      mentionable_attrs.concat(attrs.map(&:to_s))
+    def attr_mentionable(attr, options = {})
+      attr = attr.to_s
+      mentionable_attrs << [attr, options]
     end
 
     # Accessor for attributes marked mentionable.
@@ -37,11 +38,6 @@ module Mentionable
     "#{friendly_name} #{to_reference(from_project)}"
   end
 
-  # Construct a String that contains possible GFM references.
-  def mentionable_text
-    self.class.mentionable_attrs.map { |attr| send(attr) }.compact.join("\n\n")
-  end
-
   # The GFM reference to this Mentionable, which shouldn't be included in its #references.
   def local_reference
     self
@@ -54,20 +50,33 @@ module Mentionable
   end
 
   def mentioned_users(current_user = nil, load_lazy_references: true)
-    return [] if mentionable_text.blank?
-
+    # TODO: Douwe: Will be simplified when the "Simplify ..." MR is merged.
     ext = Gitlab::ReferenceExtractor.new(self.project, current_user, load_lazy_references: load_lazy_references)
-    ext.analyze(mentionable_text)
-    ext.users.uniq
+    self.class.mentionable_attrs.each do |attr, options|
+      text = send(attr)
+      cache_key = [self, attr] if options[:cache]
+      ext.analyze(text, cache_key: cache_key, pipeline: options[:pipeline])
+    end
+    ext.users
   end
 
   # Extract GFM references to other Mentionables from this Mentionable. Always excludes its #local_reference.
-  def references(p = project, current_user = self.author, text = mentionable_text, load_lazy_references: true)
+  def references(p = project, current_user = self.author, text = nil, load_lazy_references: true)
     return [] if text.blank?
 
     ext = Gitlab::ReferenceExtractor.new(p, current_user, load_lazy_references: load_lazy_references)
-    ext.analyze(text)
-    (ext.issues + ext.merge_requests + ext.commits).uniq - [local_reference]
+
+    if text
+      ext.analyze(text)
+    else
+      self.class.mentionable_attrs.each do |attr, options|
+        text = send(attr)
+        cache_key = [self, attr] if options[:cache]
+        ext.analyze(text, cache_key: cache_key)
+      end
+    end
+
+    (ext.issues + ext.merge_requests + ext.commits) - [local_reference]
   end
 
   # Create a cross-reference Note for each GFM reference to another Mentionable found in +mentionable_text+.
@@ -111,7 +120,7 @@ module Mentionable
   def detect_mentionable_changes
     source = (changes.present? ? changes : previous_changes).dup
 
-    mentionable = self.class.mentionable_attrs
+    mentionable = self.class.mentionable_attrs.map { |attr, options| attr }
 
     # Only include changed fields that are mentionable
     source.select { |key, val| mentionable.include?(key) }
diff --git a/app/models/note.rb b/app/models/note.rb
index 2fbe4784159..b4d6ddba703 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -28,7 +28,7 @@ class Note < ActiveRecord::Base
 
   default_value_for :system, false
 
-  attr_mentionable :note
+  attr_mentionable :note, cache: true, pipeline: :note
   participant :author
 
   belongs_to :project
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index 3233c6884cc..e27f20bdfb8 100644
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -43,7 +43,7 @@
           .description{class: can?(current_user, :update_issue, @issue) ? 'js-task-list-container' : ''}
             .wiki
               = preserve do
-                = markdown(@issue.description)
+                = markdown(@issue.description, cache_key: [@issue, "description"])
             %textarea.hidden.js-task-list-field
               = @issue.description
 
diff --git a/app/views/projects/merge_requests/show/_mr_box.html.haml b/app/views/projects/merge_requests/show/_mr_box.html.haml
index 448230a377c..9bfe202589e 100644
--- a/app/views/projects/merge_requests/show/_mr_box.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_box.html.haml
@@ -7,6 +7,6 @@
       .description{class: can?(current_user, :update_merge_request, @merge_request) ? 'js-task-list-container' : ''}
         .wiki
           = preserve do
-            = markdown(@merge_request.description)
+            = markdown(@merge_request.description, cache_key: [@merge_request, "description"])
         %textarea.hidden.js-task-list-field
           = @merge_request.description
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index 1638ad6891a..bcb42d39c91 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -58,7 +58,7 @@
       .note-body{class: note_editable?(note) ? 'js-task-list-container' : ''}
         .note-text
           = preserve do
-            = markdown(note.note, {no_header_anchors: true})
+            = markdown(note.note, pipeline: :note, cache_key: [note, "note"])
         - unless note.system?
           -# System notes can't be edited
           = render 'projects/notes/edit_form', note: note
diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb
index d1f22070cba..b9615f95012 100644
--- a/lib/gitlab/markdown.rb
+++ b/lib/gitlab/markdown.rb
@@ -20,6 +20,8 @@ module Gitlab
     #
     # Returns an HTML-safe String
     def self.render(text, context = {})
+      context[:pipeline] ||= :full
+
       cache_key = context.delete(:cache_key)
       cache_key = full_cache_key(cache_key, context[:pipeline])
 
@@ -33,7 +35,7 @@ module Gitlab
     end
 
     def self.render_result(text, context = {})
-      pipeline = context[:pipeline] || :full
+      pipeline = context[:pipeline] ||= :full
 
       html_pipeline = html_pipelines[pipeline]
 
@@ -129,6 +131,7 @@ module Gitlab
         atom:           :full,
         email:          :full,
         description:    :full,
+        note:           :full,
         single_line:    :gfm,
 
         asciidoc: [
@@ -170,6 +173,13 @@ module Gitlab
             only_path: false
           }
         ],
+        note: [
+          :full,
+          {
+            # TableOfContentsFilter
+            no_header_anchors: true
+          }
+        ],
         description: [
           :full,
           { 
diff --git a/lib/gitlab/reference_extractor.rb b/lib/gitlab/reference_extractor.rb
index f34bf7d1d0e..37141efb4c3 100644
--- a/lib/gitlab/reference_extractor.rb
+++ b/lib/gitlab/reference_extractor.rb
@@ -9,13 +9,12 @@ module Gitlab
       @project = project
       @current_user = current_user
       @load_lazy_references = load_lazy_references
-    end
 
-    def analyze(text, cache_key: nil)
-      references.clear
+      @texts = []
+    end
 
-      @pipeline = Gitlab::Markdown.cached?(cache_key, pipeline: :full) ? :full : :plain_markdown
-      @html = Gitlab::Markdown.render(text, project: project, cache_key: cache_key, pipeline: @pipeline)
+    def analyze(text, options = {})
+      @texts << Gitlab::Markdown.render(text, options.merge(project: project))
     end
 
     %i(user label issue merge_request snippet commit commit_range).each do |type|
@@ -46,7 +45,7 @@ module Gitlab
       filter = Gitlab::Markdown.const_get(klass)
 
       context = {
-        pipeline: [:reference_extraction],
+        pipeline: :reference_extraction,
 
         project:      project,
         current_user: current_user,
@@ -56,10 +55,11 @@ module Gitlab
         reference_filter:     filter
       }
 
-      context[:pipeline].unshift(filter) unless @pipeline == :full
-
-      result = Gitlab::Markdown.render_result(@html, context)
-      values = result[:references][filter_type].uniq
+      values = @texts.flat_map do |html|
+        text_context = context.dup
+        result = Gitlab::Markdown.render_result(html, text_context)
+        result[:references][filter_type]
+      end.uniq
 
       if @load_lazy_references
         values = Gitlab::Markdown::ReferenceFilter::LazyReference.load(values).uniq
-- 
cgit v1.2.1


From 528d2823e9888ae09aa03b72c2e61cd0b9a39937 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 14 Oct 2015 21:52:41 +0200
Subject: Remove unused Gitlab::Markdown#cached? method

---
 lib/gitlab/markdown.rb | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb
index b9615f95012..5c4481e6497 100644
--- a/lib/gitlab/markdown.rb
+++ b/lib/gitlab/markdown.rb
@@ -45,11 +45,6 @@ module Gitlab
       html_pipeline.call(text, context)
     end
 
-    def self.cached?(cache_key, pipeline: :full)
-      cache_key = full_cache_key(cache_key, pipeline)
-      cache_key ? Rails.cache.exist?(cache_key) : false
-    end
-
     # Perform post-processing on an HTML String
     #
     # This method is used to perform state-dependent changes to a String of
-- 
cgit v1.2.1


From 9c2214f202e98d0427d86a57888574327a6607dd Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 15 Oct 2015 13:41:03 +0200
Subject: Remove stray conflict marker

---
 app/models/concerns/participable.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/models/concerns/participable.rb b/app/models/concerns/participable.rb
index f5f973c0e69..85367f89f4f 100644
--- a/app/models/concerns/participable.rb
+++ b/app/models/concerns/participable.rb
@@ -37,7 +37,6 @@ module Participable
 
   # Be aware that this method makes a lot of sql queries.
   # Save result into variable if you are going to reuse it inside same request
-<<<<<<< HEAD
   def participants(current_user = self.author, load_lazy_references: true)
     participants = self.class.participant_attrs.flat_map do |attr|
       value =
-- 
cgit v1.2.1


From abbca6151d66ebc227c883af35cd01cf4d7e24eb Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 21 Oct 2015 12:18:23 +0200
Subject: Make pipelines actually make sense

---
 lib/gitlab/markdown.rb                             | 216 ++++-----------------
 lib/gitlab/markdown/asciidoc_pipeline.rb           |  13 ++
 lib/gitlab/markdown/atom_pipeline.rb               |  14 ++
 lib/gitlab/markdown/combined_pipeline.rb           |  25 +++
 lib/gitlab/markdown/description_pipeline.rb        |  14 ++
 lib/gitlab/markdown/email_pipeline.rb              |  13 ++
 lib/gitlab/markdown/full_pipeline.rb               |   9 +
 lib/gitlab/markdown/gfm_pipeline.rb                |  41 ++++
 lib/gitlab/markdown/note_pipeline.rb               |  14 ++
 lib/gitlab/markdown/pipeline.rb                    |  29 +++
 lib/gitlab/markdown/plain_markdown_pipeline.rb     |  13 ++
 lib/gitlab/markdown/post_process_pipeline.rb       |  20 ++
 .../markdown/reference_extraction_pipeline.rb      |  13 ++
 lib/gitlab/markdown/single_line_pipeline.rb        |   9 +
 14 files changed, 265 insertions(+), 178 deletions(-)
 create mode 100644 lib/gitlab/markdown/asciidoc_pipeline.rb
 create mode 100644 lib/gitlab/markdown/atom_pipeline.rb
 create mode 100644 lib/gitlab/markdown/combined_pipeline.rb
 create mode 100644 lib/gitlab/markdown/description_pipeline.rb
 create mode 100644 lib/gitlab/markdown/email_pipeline.rb
 create mode 100644 lib/gitlab/markdown/full_pipeline.rb
 create mode 100644 lib/gitlab/markdown/gfm_pipeline.rb
 create mode 100644 lib/gitlab/markdown/note_pipeline.rb
 create mode 100644 lib/gitlab/markdown/pipeline.rb
 create mode 100644 lib/gitlab/markdown/plain_markdown_pipeline.rb
 create mode 100644 lib/gitlab/markdown/post_process_pipeline.rb
 create mode 100644 lib/gitlab/markdown/reference_extraction_pipeline.rb
 create mode 100644 lib/gitlab/markdown/single_line_pipeline.rb

diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb
index 5c4481e6497..3ae4ccfacb6 100644
--- a/lib/gitlab/markdown.rb
+++ b/lib/gitlab/markdown.rb
@@ -35,14 +35,8 @@ module Gitlab
     end
 
     def self.render_result(text, context = {})
-      pipeline = context[:pipeline] ||= :full
-
-      html_pipeline = html_pipelines[pipeline]
-
-      transformers = context_transformers[pipeline]
-      context = transformers.reduce(context) { |context, transformer| transformer.call(context) }
-
-      html_pipeline.call(text, context)
+      pipeline_type = context[:pipeline] ||= :full
+      pipeline_by_type(pipeline_type).call(text, context)
     end
 
     # Perform post-processing on an HTML String
@@ -59,17 +53,37 @@ module Gitlab
     #
     # Returns an HTML-safe String
     def self.post_process(html, context)
-      html_pipeline = html_pipelines[:post_process]
+      pipeline = pipeline_by_type(:post_process)
 
       if context[:xhtml]
-        html_pipeline.to_document(html, context).to_html(save_with: Nokogiri::XML::Node::SaveOptions::AS_XHTML)
+        pipeline.to_document(html, context).to_html(save_with: Nokogiri::XML::Node::SaveOptions::AS_XHTML)
       else
-        html_pipeline.to_html(html, context)
+        pipeline.to_html(html, context)
       end.html_safe
     end
 
     private
 
+    def self.cacheless_render(text, context = {})
+      result = render_result(text, context)
+      output = result[:output]
+      if output.respond_to?(:to_html)
+        output.to_html
+      else
+        output.to_s
+      end
+    end
+
+    def self.full_cache_key(cache_key, pipeline = :full)
+      return unless cache_key
+
+      ["markdown", *cache_key, pipeline]
+    end
+
+    def self.pipeline_by_type(pipeline_type)
+      const_get("#{pipeline_type.to_s.camelize}Pipeline")
+    end
+
     # Provide autoload paths for filters to prevent a circular dependency error
     autoload :AutolinkFilter,               'gitlab/markdown/autolink_filter'
     autoload :CommitRangeReferenceFilter,   'gitlab/markdown/commit_range_reference_filter'
@@ -91,172 +105,18 @@ module Gitlab
     autoload :UserReferenceFilter,          'gitlab/markdown/user_reference_filter'
     autoload :UploadLinkFilter,             'gitlab/markdown/upload_link_filter'
 
-    def self.gfm_filters
-      @gfm_filters ||= [
-        Gitlab::Markdown::SyntaxHighlightFilter,
-        Gitlab::Markdown::SanitizationFilter,
-
-        Gitlab::Markdown::UploadLinkFilter,
-        Gitlab::Markdown::EmojiFilter,
-        Gitlab::Markdown::TableOfContentsFilter,
-        Gitlab::Markdown::AutolinkFilter,
-        Gitlab::Markdown::ExternalLinkFilter,
-
-        Gitlab::Markdown::UserReferenceFilter,
-        Gitlab::Markdown::IssueReferenceFilter,
-        Gitlab::Markdown::ExternalIssueReferenceFilter,
-        Gitlab::Markdown::MergeRequestReferenceFilter,
-        Gitlab::Markdown::SnippetReferenceFilter,
-        Gitlab::Markdown::CommitRangeReferenceFilter,
-        Gitlab::Markdown::CommitReferenceFilter,
-        Gitlab::Markdown::LabelReferenceFilter,
-
-        Gitlab::Markdown::TaskListFilter
-      ]
-    end
-
-    def self.all_filters
-      @all_filters ||= {
-        plain_markdown: [
-          Gitlab::Markdown::MarkdownFilter
-        ],
-        gfm: gfm_filters,
-
-        full:           [:plain_markdown, :gfm],
-        atom:           :full,
-        email:          :full,
-        description:    :full,
-        note:           :full,
-        single_line:    :gfm,
-
-        asciidoc: [
-          Gitlab::Markdown::RelativeLinkFilter
-        ],
-
-        post_process: [
-          Gitlab::Markdown::RelativeLinkFilter, 
-          Gitlab::Markdown::RedactorFilter
-        ],
-
-        reference_extraction: [
-          Gitlab::Markdown::ReferenceGathererFilter
-        ]
-      }
-    end
-
-    def self.all_context_transformers
-      @all_context_transformers ||= {
-        gfm: {
-          only_path: true,
-
-          # EmojiFilter
-          asset_host: Gitlab::Application.config.asset_host,
-          asset_root: Gitlab.config.gitlab.base_url
-        },
-        full: :gfm,
-
-        atom: [
-          :full, 
-          { 
-            only_path: false, 
-            xhtml: true 
-          }
-        ],
-        email: [
-          :full,
-          { 
-            only_path: false
-          }
-        ],
-        note: [
-          :full,
-          {
-            # TableOfContentsFilter
-            no_header_anchors: true
-          }
-        ],
-        description: [
-          :full,
-          { 
-            # SanitizationFilter
-            inline_sanitization: true
-          }
-        ],
-        single_line: :gfm,
-
-        post_process: {
-          post_process: true
-        }
-      }
-    end
-
-    def self.html_filters
-      @html_filters ||= Hash.new do |hash, pipeline|
-        filters = get_filters(pipeline)
-        hash[pipeline] = filters if pipeline.is_a?(Symbol)
-        filters
-      end
-    end
-
-    def self.html_pipelines
-      @html_pipelines ||= Hash.new do |hash, pipeline|
-        filters = get_filters(pipeline)
-        html_pipeline = HTML::Pipeline.new(filters)
-        hash[pipeline] = html_pipeline if pipeline.is_a?(Symbol)
-        html_pipeline
-      end
-    end
-
-    def self.context_transformers
-      @context_transformers ||= Hash.new do |hash, pipeline|
-        transformers = get_context_transformers(pipeline)
-        hash[pipeline] = transformers if pipeline.is_a?(Symbol)
-        transformers
-      end
-    end
-
-    def self.get_filters(pipelines)
-      Array.wrap(pipelines).flat_map do |pipeline|
-        case pipeline
-        when Class
-          pipeline
-        when Symbol
-          html_filters[all_filters[pipeline]]
-        when Array
-          html_filters[pipeline]
-        end
-      end.compact
-    end
-
-    def self.get_context_transformers(pipelines)
-      Array.wrap(pipelines).flat_map do |pipeline|
-        case pipeline
-        when Hash
-          ->(context) { context.merge(pipeline) }
-        when Proc
-          pipeline
-        when Symbol
-          context_transformers[all_context_transformers[pipeline]]
-        when Array
-          context_transformers[pipeline]
-        end
-      end.compact
-    end
-
-    def self.cacheless_render(text, context = {})
-      result = render_result(text, context)
-      output = result[:output]
-      if output.respond_to?(:to_html)
-        output.to_html
-      else
-        output.to_s
-      end
-    end
-
-    def self.full_cache_key(cache_key, pipeline = :full)
-      return unless cache_key && pipeline.is_a?(Symbol)
-
-      ["markdown", *cache_key, pipeline]
-    end
+    autoload :AsciidocPipeline,             'gitlab/markdown/asciidoc_pipeline'
+    autoload :AtomPipeline,                 'gitlab/markdown/atom_pipeline'
+    autoload :CombinedPipeline,             'gitlab/markdown/combined_pipeline'
+    autoload :DescriptionPipeline,          'gitlab/markdown/description_pipeline'
+    autoload :EmailPipeline,                'gitlab/markdown/email_pipeline'
+    autoload :FullPipeline,                 'gitlab/markdown/full_pipeline'
+    autoload :GfmPipeline,                  'gitlab/markdown/gfm_pipeline'
+    autoload :NotePipeline,                 'gitlab/markdown/note_pipeline'
+    autoload :Pipeline,                     'gitlab/markdown/pipeline'
+    autoload :PlainMarkdownPipeline,        'gitlab/markdown/plain_markdown_pipeline'
+    autoload :PostProcessPipeline,          'gitlab/markdown/post_process_pipeline'
+    autoload :ReferenceExtractionPipeline,  'gitlab/markdown/reference_extraction_pipeline'
+    autoload :SingleLinePipeline,           'gitlab/markdown/single_line_pipeline'
   end
 end
diff --git a/lib/gitlab/markdown/asciidoc_pipeline.rb b/lib/gitlab/markdown/asciidoc_pipeline.rb
new file mode 100644
index 00000000000..6829b4acb95
--- /dev/null
+++ b/lib/gitlab/markdown/asciidoc_pipeline.rb
@@ -0,0 +1,13 @@
+require 'gitlab/markdown'
+
+module Gitlab
+  module Markdown
+    class AsciidocPipeline < Pipeline
+      def self.filters
+        [
+          Gitlab::Markdown::RelativeLinkFilter
+        ]
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/atom_pipeline.rb b/lib/gitlab/markdown/atom_pipeline.rb
new file mode 100644
index 00000000000..e151f8f5e5a
--- /dev/null
+++ b/lib/gitlab/markdown/atom_pipeline.rb
@@ -0,0 +1,14 @@
+require 'gitlab/markdown'
+
+module Gitlab
+  module Markdown
+    class AtomPipeline < FullPipeline
+      def self.transform_context(context)
+        super(context).merge( 
+          only_path: false, 
+          xhtml: true 
+        )
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/combined_pipeline.rb b/lib/gitlab/markdown/combined_pipeline.rb
new file mode 100644
index 00000000000..a3d717550f5
--- /dev/null
+++ b/lib/gitlab/markdown/combined_pipeline.rb
@@ -0,0 +1,25 @@
+require 'gitlab/markdown'
+
+module Gitlab
+  module Markdown
+    module CombinedPipeline
+      def self.new(*pipelines)
+        Class.new(Pipeline) do
+          const_set :PIPELINES, pipelines
+
+          def self.filters
+            pipelines.flat_map(&:filters)
+          end
+
+          def self.transform_context(context)
+            pipelines.reduce(context) { |context, pipeline| pipeline.transform_context(context) }
+          end
+
+          def self.pipelines
+            self::PIPELINES
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/description_pipeline.rb b/lib/gitlab/markdown/description_pipeline.rb
new file mode 100644
index 00000000000..76f6948af8f
--- /dev/null
+++ b/lib/gitlab/markdown/description_pipeline.rb
@@ -0,0 +1,14 @@
+require 'gitlab/markdown'
+
+module Gitlab
+  module Markdown
+    class DescriptionPipeline < FullPipeline
+      def self.transform_context(context)
+        super(context).merge( 
+          # SanitizationFilter
+          inline_sanitization: true
+        )
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/email_pipeline.rb b/lib/gitlab/markdown/email_pipeline.rb
new file mode 100644
index 00000000000..b88cb790270
--- /dev/null
+++ b/lib/gitlab/markdown/email_pipeline.rb
@@ -0,0 +1,13 @@
+require 'gitlab/markdown'
+
+module Gitlab
+  module Markdown
+    class EmailPipeline < FullPipeline
+      def self.transform_context(context)
+        super(context).merge( 
+          only_path: false
+        )
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/full_pipeline.rb b/lib/gitlab/markdown/full_pipeline.rb
new file mode 100644
index 00000000000..553e9367c1c
--- /dev/null
+++ b/lib/gitlab/markdown/full_pipeline.rb
@@ -0,0 +1,9 @@
+require 'gitlab/markdown'
+
+module Gitlab
+  module Markdown
+    class FullPipeline < CombinedPipeline.new(PlainMarkdownPipeline, GfmPipeline)
+      
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/gfm_pipeline.rb b/lib/gitlab/markdown/gfm_pipeline.rb
new file mode 100644
index 00000000000..ca90bd75d77
--- /dev/null
+++ b/lib/gitlab/markdown/gfm_pipeline.rb
@@ -0,0 +1,41 @@
+require 'gitlab/markdown'
+
+module Gitlab
+  module Markdown
+    class GfmPipeline < Pipeline
+      def self.filters
+        @filters ||= [
+          Gitlab::Markdown::SyntaxHighlightFilter,
+          Gitlab::Markdown::SanitizationFilter,
+
+          Gitlab::Markdown::UploadLinkFilter,
+          Gitlab::Markdown::EmojiFilter,
+          Gitlab::Markdown::TableOfContentsFilter,
+          Gitlab::Markdown::AutolinkFilter,
+          Gitlab::Markdown::ExternalLinkFilter,
+
+          Gitlab::Markdown::UserReferenceFilter,
+          Gitlab::Markdown::IssueReferenceFilter,
+          Gitlab::Markdown::ExternalIssueReferenceFilter,
+          Gitlab::Markdown::MergeRequestReferenceFilter,
+          Gitlab::Markdown::SnippetReferenceFilter,
+          Gitlab::Markdown::CommitRangeReferenceFilter,
+          Gitlab::Markdown::CommitReferenceFilter,
+          Gitlab::Markdown::LabelReferenceFilter,
+
+          Gitlab::Markdown::TaskListFilter
+        ]
+      end
+
+      def self.transform_context(context)
+        context.merge(
+          only_path: true,
+
+          # EmojiFilter
+          asset_host: Gitlab::Application.config.asset_host,
+          asset_root: Gitlab.config.gitlab.base_url
+        )
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/note_pipeline.rb b/lib/gitlab/markdown/note_pipeline.rb
new file mode 100644
index 00000000000..a8bf5f42d8e
--- /dev/null
+++ b/lib/gitlab/markdown/note_pipeline.rb
@@ -0,0 +1,14 @@
+require 'gitlab/markdown'
+
+module Gitlab
+  module Markdown
+    class NotePipeline < FullPipeline
+      def self.transform_context(context)
+        super(context).merge( 
+          # TableOfContentsFilter
+          no_header_anchors: true
+        )
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/pipeline.rb b/lib/gitlab/markdown/pipeline.rb
new file mode 100644
index 00000000000..3c0b676a073
--- /dev/null
+++ b/lib/gitlab/markdown/pipeline.rb
@@ -0,0 +1,29 @@
+require 'gitlab/markdown'
+
+module Gitlab
+  module Markdown
+    class Pipeline
+      def self.filters
+        []
+      end
+
+      def self.transform_context(context)
+        context
+      end
+
+      def self.html_pipeline
+        @html_pipeline ||= HTML::Pipeline.new(filters)
+      end
+
+      class << self
+        %i(call to_document to_html).each do |meth|
+          define_method(meth) do |text, context|
+            context = transform_context(context)
+
+            html_pipeline.send(meth, text, context)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/plain_markdown_pipeline.rb b/lib/gitlab/markdown/plain_markdown_pipeline.rb
new file mode 100644
index 00000000000..0abb93f8a03
--- /dev/null
+++ b/lib/gitlab/markdown/plain_markdown_pipeline.rb
@@ -0,0 +1,13 @@
+require 'gitlab/markdown'
+
+module Gitlab
+  module Markdown
+    class PlainMarkdownPipeline < Pipeline
+      def self.filters
+        [
+          Gitlab::Markdown::MarkdownFilter
+        ]
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/post_process_pipeline.rb b/lib/gitlab/markdown/post_process_pipeline.rb
new file mode 100644
index 00000000000..60cc32f490e
--- /dev/null
+++ b/lib/gitlab/markdown/post_process_pipeline.rb
@@ -0,0 +1,20 @@
+require 'gitlab/markdown'
+
+module Gitlab
+  module Markdown
+    class PostProcessPipeline < Pipeline
+      def self.filters
+        [
+          Gitlab::Markdown::RelativeLinkFilter, 
+          Gitlab::Markdown::RedactorFilter
+        ]
+      end
+
+      def self.transform_context(context)
+        context.merge(
+          post_process: true
+        )
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/reference_extraction_pipeline.rb b/lib/gitlab/markdown/reference_extraction_pipeline.rb
new file mode 100644
index 00000000000..a89ab462bac
--- /dev/null
+++ b/lib/gitlab/markdown/reference_extraction_pipeline.rb
@@ -0,0 +1,13 @@
+require 'gitlab/markdown'
+
+module Gitlab
+  module Markdown
+    class ReferenceExtractionPipeline < Pipeline
+      def self.filters
+        [
+          Gitlab::Markdown::ReferenceGathererFilter
+        ]
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/single_line_pipeline.rb b/lib/gitlab/markdown/single_line_pipeline.rb
new file mode 100644
index 00000000000..2f24927b879
--- /dev/null
+++ b/lib/gitlab/markdown/single_line_pipeline.rb
@@ -0,0 +1,9 @@
+require 'gitlab/markdown'
+
+module Gitlab
+  module Markdown
+    class SingleLinePipeline < GfmPipeline
+      
+    end
+  end
+end
-- 
cgit v1.2.1


From f65840bc842b86cd71e70af8b9acdb1a786d9054 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 22 Oct 2015 11:00:34 +0200
Subject: Fix Markdown XHTML context param

---
 lib/gitlab/markdown.rb | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb
index 3ae4ccfacb6..5f1a6c8ceec 100644
--- a/lib/gitlab/markdown.rb
+++ b/lib/gitlab/markdown.rb
@@ -20,8 +20,6 @@ module Gitlab
     #
     # Returns an HTML-safe String
     def self.render(text, context = {})
-      context[:pipeline] ||= :full
-
       cache_key = context.delete(:cache_key)
       cache_key = full_cache_key(cache_key, context[:pipeline])
 
@@ -35,8 +33,7 @@ module Gitlab
     end
 
     def self.render_result(text, context = {})
-      pipeline_type = context[:pipeline] ||= :full
-      pipeline_by_type(pipeline_type).call(text, context)
+      pipeline_by_name(context[:pipeline]).call(text, context)
     end
 
     # Perform post-processing on an HTML String
@@ -53,7 +50,10 @@ module Gitlab
     #
     # Returns an HTML-safe String
     def self.post_process(html, context)
-      pipeline = pipeline_by_type(:post_process)
+      pipeline = pipeline_by_name(context[:pipeline])
+      context = pipeline.transform_context(context)
+
+      pipeline = pipeline_by_name(:post_process)
 
       if context[:xhtml]
         pipeline.to_document(html, context).to_html(save_with: Nokogiri::XML::Node::SaveOptions::AS_XHTML)
@@ -74,14 +74,15 @@ module Gitlab
       end
     end
 
-    def self.full_cache_key(cache_key, pipeline = :full)
+    def self.full_cache_key(cache_key, pipeline_name)
       return unless cache_key
-
+      pipeline_name ||= :full
       ["markdown", *cache_key, pipeline]
     end
 
-    def self.pipeline_by_type(pipeline_type)
-      const_get("#{pipeline_type.to_s.camelize}Pipeline")
+    def self.pipeline_by_name(pipeline_name)
+      pipeline_name ||= :full
+      const_get("#{pipeline_name.to_s.camelize}Pipeline")
     end
 
     # Provide autoload paths for filters to prevent a circular dependency error
-- 
cgit v1.2.1


From adba37f99aa6351ce7ca29055d5aab284058bc2e Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 22 Oct 2015 11:02:21 +0200
Subject: Use markdown with gfm pipeline rather than gfm method

---
 app/views/projects/commits/show.atom.builder       | 2 +-
 app/views/projects/issues/_closed_by_box.html.haml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/projects/commits/show.atom.builder b/app/views/projects/commits/show.atom.builder
index 3854ad5d611..7aab98e07c4 100644
--- a/app/views/projects/commits/show.atom.builder
+++ b/app/views/projects/commits/show.atom.builder
@@ -17,7 +17,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear
         xml.name commit.author_name
         xml.email commit.author_email
       end
-      xml.summary gfm(commit.description)
+      xml.summary markdown(commit.description, pipeline: :atom)
     end
   end
 end
diff --git a/app/views/projects/issues/_closed_by_box.html.haml b/app/views/projects/issues/_closed_by_box.html.haml
index aef352029d0..eebe36bc441 100644
--- a/app/views/projects/issues/_closed_by_box.html.haml
+++ b/app/views/projects/issues/_closed_by_box.html.haml
@@ -1,3 +1,3 @@
 .issue-closed-by-widget
   = icon('check')
-  This issue will be closed automatically when merge request #{gfm(merge_requests_sentence(@closed_by_merge_requests.sort))} is accepted.
+  This issue will be closed automatically when merge request #{markdown(merge_requests_sentence(@closed_by_merge_requests.sort), pipeline: :gfm)} is accepted.
-- 
cgit v1.2.1


From c1ecfb5de960a675888640a05c75c07217c2d293 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 22 Oct 2015 15:38:11 +0200
Subject: Disabling caching in test environment because it was causing issues
 with Markdown

---
 config/environments/test.rb          |  2 ++
 config/initializers/session_store.rb | 22 +++++++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/config/environments/test.rb b/config/environments/test.rb
index 2d5e7addcd3..e03f54c5530 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -7,6 +7,8 @@ Gitlab::Application.configure do
   # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = false
 
+  config.cache_store = :null_store
+
   # Configure static asset server for tests with Cache-Control for performance
   config.serve_static_assets = true
   config.static_cache_control = "public, max-age=3600"
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index 04ed9e90df5..6be21a771e3 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -9,12 +9,16 @@ begin
 rescue
 end
 
-Gitlab::Application.config.session_store(
-  :redis_store, # Using the cookie_store would enable session replay attacks.
-  servers: Gitlab::Application.config.cache_store[1].merge(namespace: 'session:gitlab'), # re-use the Redis config from the Rails cache store
-  key: '_gitlab_session',
-  secure: Gitlab.config.gitlab.https,
-  httponly: true,
-  expire_after: Settings.gitlab['session_expire_delay'] * 60,
-  path: (Gitlab::Application.config.relative_url_root.nil?) ? '/' : Gitlab::Application.config.relative_url_root
-)
+if Rails.env.test?
+  Gitlab::Application.config.session_store :cookie_store, key: "_gitlab_session"
+else
+  Gitlab::Application.config.session_store(
+    :redis_store, # Using the cookie_store would enable session replay attacks.
+    servers: Gitlab::Application.config.cache_store[1].merge(namespace: 'session:gitlab'), # re-use the Redis config from the Rails cache store
+    key: '_gitlab_session',
+    secure: Gitlab.config.gitlab.https,
+    httponly: true,
+    expire_after: Settings.gitlab['session_expire_delay'] * 60,
+    path: (Gitlab::Application.config.relative_url_root.nil?) ? '/' : Gitlab::Application.config.relative_url_root
+  )
+end
-- 
cgit v1.2.1


From c746a1de4ef75034c75d20e763ccfa1f73750722 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 22 Oct 2015 15:40:02 +0200
Subject: Use faster, more appropriate pipeline for mentionable attributes

---
 app/models/commit.rb            | 2 +-
 app/models/concerns/issuable.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/commit.rb b/app/models/commit.rb
index 492f6be1ce3..a5f70b3a351 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -7,7 +7,7 @@ class Commit
   include Referable
   include StaticModel
 
-  attr_mentionable :safe_message
+  attr_mentionable :safe_message, pipeline: :single_line
   participant :author, :committer, :notes
 
   attr_accessor :project
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 54bfd4eced5..1d7cecef97b 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -46,7 +46,7 @@ module Issuable
              allow_nil: true,
              prefix: true
 
-    attr_mentionable :title 
+    attr_mentionable :title, pipeline: :single_line
     attr_mentionable :description, cache: true
     participant :author, :assignee, :notes_with_associations
   end
-- 
cgit v1.2.1


From 51ed8fd706802fe0fffe7a2db0b5adc1f2196e50 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 22 Oct 2015 15:40:21 +0200
Subject: Use correct var name

---
 lib/gitlab/markdown.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb
index 5f1a6c8ceec..969607558ef 100644
--- a/lib/gitlab/markdown.rb
+++ b/lib/gitlab/markdown.rb
@@ -77,7 +77,7 @@ module Gitlab
     def self.full_cache_key(cache_key, pipeline_name)
       return unless cache_key
       pipeline_name ||= :full
-      ["markdown", *cache_key, pipeline]
+      ["markdown", *cache_key, pipeline_name]
     end
 
     def self.pipeline_by_name(pipeline_name)
-- 
cgit v1.2.1


From aa4007a597ea6c7de11a8f37de2fd889aa6e6646 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 22 Oct 2015 15:40:36 +0200
Subject: Slight refactoring

---
 lib/gitlab/reference_extractor.rb | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/lib/gitlab/reference_extractor.rb b/lib/gitlab/reference_extractor.rb
index 69c7a0f4779..e5cafebdbc0 100644
--- a/lib/gitlab/reference_extractor.rb
+++ b/lib/gitlab/reference_extractor.rb
@@ -11,6 +11,7 @@ module Gitlab
       @load_lazy_references = load_lazy_references
 
       @texts = []
+      @references = {}
     end
 
     def analyze(text, options = {})
@@ -19,21 +20,12 @@ module Gitlab
 
     %i(user label issue merge_request snippet commit commit_range).each do |type|
       define_method("#{type}s") do
-        references[type]
+        @references[type] ||= pipeline_result(type)
       end
     end
 
     private
 
-    def references
-      @references ||= Hash.new do |references, type|
-        type = type.to_sym
-        next references[type] if references.has_key?(type)
-
-        references[type] = pipeline_result(type)
-      end
-    end
-
     # Instantiate and call HTML::Pipeline with a single reference filter type,
     # returning the result
     #
-- 
cgit v1.2.1


From 46025ffb8c717eedced397edd19ce8f0d67802e7 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 22 Oct 2015 15:40:42 +0200
Subject: Fix specs

---
 spec/lib/gitlab/markdown/sanitization_filter_spec.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/lib/gitlab/markdown/sanitization_filter_spec.rb b/spec/lib/gitlab/markdown/sanitization_filter_spec.rb
index e50c82d0b3c..8243c994600 100644
--- a/spec/lib/gitlab/markdown/sanitization_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/sanitization_filter_spec.rb
@@ -93,16 +93,16 @@ module Gitlab::Markdown
       end
     end
 
-    context 'when pipeline is :description' do
+    context 'when inline_sanitization is true' do
       it 'uses a stricter whitelist' do
-        doc = filter('<h1>Description</h1>', pipeline: :description)
+        doc = filter('<h1>Description</h1>', inline_sanitization: true)
         expect(doc.to_html.strip).to eq 'Description'
       end
 
       %w(pre code img ol ul li).each do |elem|
         it "removes '#{elem}' elements" do
           act = "<#{elem}>Description</#{elem}>"
-          expect(filter(act, pipeline: :description).to_html.strip).
+          expect(filter(act, inline_sanitization: true).to_html.strip).
             to eq 'Description'
         end
       end
@@ -110,7 +110,7 @@ module Gitlab::Markdown
       %w(b i strong em a ins del sup sub p).each do |elem|
         it "still allows '#{elem}' elements" do
           exp = act = "<#{elem}>Description</#{elem}>"
-          expect(filter(act, pipeline: :description).to_html).to eq exp
+          expect(filter(act, inline_sanitization: true).to_html).to eq exp
         end
       end
     end
-- 
cgit v1.2.1


From 7851a292a1fc7da3cd2d1140cd40f35009a9c082 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Fri, 23 Oct 2015 15:00:26 +0200
Subject: Use single_line Markdown pipeline for commit description

---
 app/views/projects/commits/show.atom.builder | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/projects/commits/show.atom.builder b/app/views/projects/commits/show.atom.builder
index 7aab98e07c4..a40720ab4a8 100644
--- a/app/views/projects/commits/show.atom.builder
+++ b/app/views/projects/commits/show.atom.builder
@@ -17,7 +17,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear
         xml.name commit.author_name
         xml.email commit.author_email
       end
-      xml.summary markdown(commit.description, pipeline: :atom)
+      xml.summary markdown(commit.description, pipeline: :single_line)
     end
   end
 end
-- 
cgit v1.2.1


From 2bbdeb91ca6b2c1e4fa10dbed34f9fff39e790f4 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Tue, 27 Oct 2015 15:22:48 +0100
Subject: Reset memoized project repository when path changes

---
 app/models/project.rb             | 1 +
 app/views/projects/edit.html.haml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index 74b89aad499..e0b44ee9bea 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -647,6 +647,7 @@ class Project < ActiveRecord::Base
         gitlab_shell.mv_repository("#{old_path_with_namespace}.wiki", "#{new_path_with_namespace}.wiki")
         send_move_instructions(old_path_with_namespace)
         reset_events_cache
+        @repository = nil
       rescue
         # Returning false does not rollback after_* transaction but gives
         # us information about failing some of tasks
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index afbf88b5507..f5bb00b0612 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -24,10 +24,10 @@
               .col-sm-10
                 = f.text_area :description, placeholder: "Awesome project", class: "form-control", rows: 3, maxlength: 250
 
-            - if @project.repository.exists? && @project.repository.branch_names.any?
+            - unless @project.empty_repo?
               .form-group
                 = f.label :default_branch, "Default Branch", class: 'control-label'
-                .col-sm-10= f.select(:default_branch, @repository.branch_names, {}, {class: 'select2 select-wide'})
+                .col-sm-10= f.select(:default_branch, @project.repository.branch_names, {}, {class: 'select2 select-wide'})
 
 
           = render 'shared/visibility_level', f: f, visibility_level: @project.visibility_level, can_change_visibility_level: can_change_visibility_level?(@project, current_user), form_model: @project
-- 
cgit v1.2.1


From 28af56dea5a88ffcaceb082cf67c9c1ab021609d Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Tue, 27 Oct 2015 17:49:34 +0100
Subject: gfm is no longer

---
 app/views/shared/snippets/_header.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/shared/snippets/_header.html.haml b/app/views/shared/snippets/_header.html.haml
index 0a4a790ec5e..dc98d310a13 100644
--- a/app/views/shared/snippets/_header.html.haml
+++ b/app/views/shared/snippets/_header.html.haml
@@ -21,4 +21,4 @@
         = render "snippets/actions"
   .gray-content-block.middle-block
     %h2.snippet-title
-      = gfm escape_once(@snippet.title)
+      = markdown escape_once(@snippet.title), pipeline: :single_line
-- 
cgit v1.2.1


From e1e67d383e4b56c9e1848aebc175402a71502e82 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 19 Nov 2015 16:18:13 +0100
Subject: Move Markdown filters and pipelines into folders.

---
 lib/gitlab/markdown.rb                             |  80 ++++-----
 lib/gitlab/markdown/asciidoc_pipeline.rb           |  13 --
 lib/gitlab/markdown/atom_pipeline.rb               |  14 --
 lib/gitlab/markdown/autolink_filter.rb             | 107 -----------
 .../markdown/commit_range_reference_filter.rb      |  92 ----------
 lib/gitlab/markdown/commit_reference_filter.rb     |  88 ---------
 lib/gitlab/markdown/description_pipeline.rb        |  14 --
 lib/gitlab/markdown/email_pipeline.rb              |  13 --
 lib/gitlab/markdown/emoji_filter.rb                |  80 ---------
 .../markdown/external_issue_reference_filter.rb    |  63 -------
 lib/gitlab/markdown/external_link_filter.rb        |  34 ----
 lib/gitlab/markdown/filter/autolink_filter.rb      | 107 +++++++++++
 .../filter/commit_range_reference_filter.rb        |  92 ++++++++++
 .../markdown/filter/commit_reference_filter.rb     |  88 +++++++++
 lib/gitlab/markdown/filter/emoji_filter.rb         |  80 +++++++++
 .../filter/external_issue_reference_filter.rb      |  63 +++++++
 lib/gitlab/markdown/filter/external_link_filter.rb |  34 ++++
 .../markdown/filter/issue_reference_filter.rb      |  23 +++
 .../markdown/filter/label_reference_filter.rb      |  87 +++++++++
 lib/gitlab/markdown/filter/markdown_filter.rb      |  39 ++++
 .../filter/merge_request_reference_filter.rb       |  25 +++
 lib/gitlab/markdown/filter/redactor_filter.rb      |  40 +++++
 .../markdown/filter/reference_gatherer_filter.rb   |  63 +++++++
 lib/gitlab/markdown/filter/relative_link_filter.rb | 157 ++++++++++++++++
 lib/gitlab/markdown/filter/sanitization_filter.rb  |  99 ++++++++++
 .../markdown/filter/snippet_reference_filter.rb    |  25 +++
 .../markdown/filter/syntax_highlight_filter.rb     |  45 +++++
 .../markdown/filter/table_of_contents_filter.rb    |  63 +++++++
 lib/gitlab/markdown/filter/task_list_filter.rb     |  24 +++
 lib/gitlab/markdown/filter/upload_link_filter.rb   |  47 +++++
 .../markdown/filter/user_reference_filter.rb       | 125 +++++++++++++
 lib/gitlab/markdown/full_pipeline.rb               |   9 -
 lib/gitlab/markdown/gfm_pipeline.rb                |  41 -----
 lib/gitlab/markdown/issue_reference_filter.rb      |  23 ---
 lib/gitlab/markdown/label_reference_filter.rb      |  87 ---------
 lib/gitlab/markdown/markdown_filter.rb             |  39 ----
 .../markdown/merge_request_reference_filter.rb     |  25 ---
 lib/gitlab/markdown/note_pipeline.rb               |  14 --
 lib/gitlab/markdown/pipeline.rb                    |   5 +
 lib/gitlab/markdown/pipeline/asciidoc_pipeline.rb  |  13 ++
 lib/gitlab/markdown/pipeline/atom_pipeline.rb      |  14 ++
 .../markdown/pipeline/description_pipeline.rb      |  14 ++
 lib/gitlab/markdown/pipeline/email_pipeline.rb     |  13 ++
 lib/gitlab/markdown/pipeline/full_pipeline.rb      |   9 +
 lib/gitlab/markdown/pipeline/gfm_pipeline.rb       |  41 +++++
 lib/gitlab/markdown/pipeline/note_pipeline.rb      |  14 ++
 .../markdown/pipeline/plain_markdown_pipeline.rb   |  13 ++
 .../markdown/pipeline/post_process_pipeline.rb     |  20 +++
 .../pipeline/reference_extraction_pipeline.rb      |  13 ++
 .../markdown/pipeline/single_line_pipeline.rb      |   9 +
 lib/gitlab/markdown/plain_markdown_pipeline.rb     |  13 --
 lib/gitlab/markdown/post_process_pipeline.rb       |  20 ---
 lib/gitlab/markdown/redactor_filter.rb             |  40 -----
 .../markdown/reference_extraction_pipeline.rb      |  13 --
 lib/gitlab/markdown/reference_filter.rb            |   4 +
 lib/gitlab/markdown/reference_gatherer_filter.rb   |  63 -------
 lib/gitlab/markdown/relative_link_filter.rb        | 157 ----------------
 lib/gitlab/markdown/sanitization_filter.rb         |  99 ----------
 lib/gitlab/markdown/single_line_pipeline.rb        |   9 -
 lib/gitlab/markdown/snippet_reference_filter.rb    |  25 ---
 lib/gitlab/markdown/syntax_highlight_filter.rb     |  45 -----
 lib/gitlab/markdown/table_of_contents_filter.rb    |  63 -------
 lib/gitlab/markdown/task_list_filter.rb            |  24 ---
 lib/gitlab/markdown/upload_link_filter.rb          |  47 -----
 lib/gitlab/markdown/user_reference_filter.rb       | 125 -------------
 lib/gitlab/reference_extractor.rb                  |   3 +-
 spec/lib/gitlab/markdown/autolink_filter_spec.rb   | 114 ------------
 .../markdown/commit_range_reference_filter_spec.rb | 145 ---------------
 .../markdown/commit_reference_filter_spec.rb       | 135 --------------
 .../markdown/cross_project_reference_spec.rb       |  40 ++---
 spec/lib/gitlab/markdown/emoji_filter_spec.rb      |  95 ----------
 .../external_issue_reference_filter_spec.rb        |  79 --------
 .../gitlab/markdown/external_link_filter_spec.rb   |  31 ----
 .../gitlab/markdown/filter/autolink_filter_spec.rb | 112 ++++++++++++
 .../filter/commit_range_reference_filter_spec.rb   | 143 +++++++++++++++
 .../filter/commit_reference_filter_spec.rb         | 133 ++++++++++++++
 .../gitlab/markdown/filter/emoji_filter_spec.rb    |  98 ++++++++++
 .../filter/external_issue_reference_filter_spec.rb |  77 ++++++++
 .../markdown/filter/external_link_filter_spec.rb   |  29 +++
 .../markdown/filter/issue_reference_filter_spec.rb | 137 ++++++++++++++
 .../markdown/filter/label_reference_filter_spec.rb | 142 +++++++++++++++
 .../filter/merge_request_reference_filter_spec.rb  | 118 ++++++++++++
 .../gitlab/markdown/filter/redactor_filter_spec.rb |  89 +++++++++
 .../filter/reference_gatherer_filter_spec.rb       |  87 +++++++++
 .../markdown/filter/relative_link_filter_spec.rb   | 147 +++++++++++++++
 .../markdown/filter/sanitization_filter_spec.rb    | 197 ++++++++++++++++++++
 .../filter/snippet_reference_filter_spec.rb        | 116 ++++++++++++
 .../filter/syntax_highlight_filter_spec.rb         |  17 ++
 .../filter/table_of_contents_filter_spec.rb        |  97 ++++++++++
 .../markdown/filter/task_list_filter_spec.rb       |  10 ++
 .../markdown/filter/upload_link_filter_spec.rb     |  73 ++++++++
 .../markdown/filter/user_reference_filter_spec.rb  | 120 +++++++++++++
 .../gitlab/markdown/issue_reference_filter_spec.rb | 139 --------------
 .../gitlab/markdown/label_reference_filter_spec.rb | 144 ---------------
 .../merge_request_reference_filter_spec.rb         | 120 -------------
 spec/lib/gitlab/markdown/redactor_filter_spec.rb   |  91 ----------
 .../markdown/reference_gatherer_filter_spec.rb     |  89 ---------
 .../gitlab/markdown/relative_link_filter_spec.rb   | 149 ---------------
 .../gitlab/markdown/sanitization_filter_spec.rb    | 199 ---------------------
 .../markdown/snippet_reference_filter_spec.rb      | 118 ------------
 .../markdown/syntax_highlight_filter_spec.rb       |  19 --
 .../markdown/table_of_contents_filter_spec.rb      |  99 ----------
 spec/lib/gitlab/markdown/task_list_filter_spec.rb  |  12 --
 .../lib/gitlab/markdown/upload_link_filter_spec.rb |  75 --------
 .../gitlab/markdown/user_reference_filter_spec.rb  | 122 -------------
 105 files changed, 3506 insertions(+), 3541 deletions(-)
 delete mode 100644 lib/gitlab/markdown/asciidoc_pipeline.rb
 delete mode 100644 lib/gitlab/markdown/atom_pipeline.rb
 delete mode 100644 lib/gitlab/markdown/autolink_filter.rb
 delete mode 100644 lib/gitlab/markdown/commit_range_reference_filter.rb
 delete mode 100644 lib/gitlab/markdown/commit_reference_filter.rb
 delete mode 100644 lib/gitlab/markdown/description_pipeline.rb
 delete mode 100644 lib/gitlab/markdown/email_pipeline.rb
 delete mode 100644 lib/gitlab/markdown/emoji_filter.rb
 delete mode 100644 lib/gitlab/markdown/external_issue_reference_filter.rb
 delete mode 100644 lib/gitlab/markdown/external_link_filter.rb
 create mode 100644 lib/gitlab/markdown/filter/autolink_filter.rb
 create mode 100644 lib/gitlab/markdown/filter/commit_range_reference_filter.rb
 create mode 100644 lib/gitlab/markdown/filter/commit_reference_filter.rb
 create mode 100644 lib/gitlab/markdown/filter/emoji_filter.rb
 create mode 100644 lib/gitlab/markdown/filter/external_issue_reference_filter.rb
 create mode 100644 lib/gitlab/markdown/filter/external_link_filter.rb
 create mode 100644 lib/gitlab/markdown/filter/issue_reference_filter.rb
 create mode 100644 lib/gitlab/markdown/filter/label_reference_filter.rb
 create mode 100644 lib/gitlab/markdown/filter/markdown_filter.rb
 create mode 100644 lib/gitlab/markdown/filter/merge_request_reference_filter.rb
 create mode 100644 lib/gitlab/markdown/filter/redactor_filter.rb
 create mode 100644 lib/gitlab/markdown/filter/reference_gatherer_filter.rb
 create mode 100644 lib/gitlab/markdown/filter/relative_link_filter.rb
 create mode 100644 lib/gitlab/markdown/filter/sanitization_filter.rb
 create mode 100644 lib/gitlab/markdown/filter/snippet_reference_filter.rb
 create mode 100644 lib/gitlab/markdown/filter/syntax_highlight_filter.rb
 create mode 100644 lib/gitlab/markdown/filter/table_of_contents_filter.rb
 create mode 100644 lib/gitlab/markdown/filter/task_list_filter.rb
 create mode 100644 lib/gitlab/markdown/filter/upload_link_filter.rb
 create mode 100644 lib/gitlab/markdown/filter/user_reference_filter.rb
 delete mode 100644 lib/gitlab/markdown/full_pipeline.rb
 delete mode 100644 lib/gitlab/markdown/gfm_pipeline.rb
 delete mode 100644 lib/gitlab/markdown/issue_reference_filter.rb
 delete mode 100644 lib/gitlab/markdown/label_reference_filter.rb
 delete mode 100644 lib/gitlab/markdown/markdown_filter.rb
 delete mode 100644 lib/gitlab/markdown/merge_request_reference_filter.rb
 delete mode 100644 lib/gitlab/markdown/note_pipeline.rb
 create mode 100644 lib/gitlab/markdown/pipeline/asciidoc_pipeline.rb
 create mode 100644 lib/gitlab/markdown/pipeline/atom_pipeline.rb
 create mode 100644 lib/gitlab/markdown/pipeline/description_pipeline.rb
 create mode 100644 lib/gitlab/markdown/pipeline/email_pipeline.rb
 create mode 100644 lib/gitlab/markdown/pipeline/full_pipeline.rb
 create mode 100644 lib/gitlab/markdown/pipeline/gfm_pipeline.rb
 create mode 100644 lib/gitlab/markdown/pipeline/note_pipeline.rb
 create mode 100644 lib/gitlab/markdown/pipeline/plain_markdown_pipeline.rb
 create mode 100644 lib/gitlab/markdown/pipeline/post_process_pipeline.rb
 create mode 100644 lib/gitlab/markdown/pipeline/reference_extraction_pipeline.rb
 create mode 100644 lib/gitlab/markdown/pipeline/single_line_pipeline.rb
 delete mode 100644 lib/gitlab/markdown/plain_markdown_pipeline.rb
 delete mode 100644 lib/gitlab/markdown/post_process_pipeline.rb
 delete mode 100644 lib/gitlab/markdown/redactor_filter.rb
 delete mode 100644 lib/gitlab/markdown/reference_extraction_pipeline.rb
 delete mode 100644 lib/gitlab/markdown/reference_gatherer_filter.rb
 delete mode 100644 lib/gitlab/markdown/relative_link_filter.rb
 delete mode 100644 lib/gitlab/markdown/sanitization_filter.rb
 delete mode 100644 lib/gitlab/markdown/single_line_pipeline.rb
 delete mode 100644 lib/gitlab/markdown/snippet_reference_filter.rb
 delete mode 100644 lib/gitlab/markdown/syntax_highlight_filter.rb
 delete mode 100644 lib/gitlab/markdown/table_of_contents_filter.rb
 delete mode 100644 lib/gitlab/markdown/task_list_filter.rb
 delete mode 100644 lib/gitlab/markdown/upload_link_filter.rb
 delete mode 100644 lib/gitlab/markdown/user_reference_filter.rb
 delete mode 100644 spec/lib/gitlab/markdown/autolink_filter_spec.rb
 delete mode 100644 spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
 delete mode 100644 spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
 delete mode 100644 spec/lib/gitlab/markdown/emoji_filter_spec.rb
 delete mode 100644 spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb
 delete mode 100644 spec/lib/gitlab/markdown/external_link_filter_spec.rb
 create mode 100644 spec/lib/gitlab/markdown/filter/autolink_filter_spec.rb
 create mode 100644 spec/lib/gitlab/markdown/filter/commit_range_reference_filter_spec.rb
 create mode 100644 spec/lib/gitlab/markdown/filter/commit_reference_filter_spec.rb
 create mode 100644 spec/lib/gitlab/markdown/filter/emoji_filter_spec.rb
 create mode 100644 spec/lib/gitlab/markdown/filter/external_issue_reference_filter_spec.rb
 create mode 100644 spec/lib/gitlab/markdown/filter/external_link_filter_spec.rb
 create mode 100644 spec/lib/gitlab/markdown/filter/issue_reference_filter_spec.rb
 create mode 100644 spec/lib/gitlab/markdown/filter/label_reference_filter_spec.rb
 create mode 100644 spec/lib/gitlab/markdown/filter/merge_request_reference_filter_spec.rb
 create mode 100644 spec/lib/gitlab/markdown/filter/redactor_filter_spec.rb
 create mode 100644 spec/lib/gitlab/markdown/filter/reference_gatherer_filter_spec.rb
 create mode 100644 spec/lib/gitlab/markdown/filter/relative_link_filter_spec.rb
 create mode 100644 spec/lib/gitlab/markdown/filter/sanitization_filter_spec.rb
 create mode 100644 spec/lib/gitlab/markdown/filter/snippet_reference_filter_spec.rb
 create mode 100644 spec/lib/gitlab/markdown/filter/syntax_highlight_filter_spec.rb
 create mode 100644 spec/lib/gitlab/markdown/filter/table_of_contents_filter_spec.rb
 create mode 100644 spec/lib/gitlab/markdown/filter/task_list_filter_spec.rb
 create mode 100644 spec/lib/gitlab/markdown/filter/upload_link_filter_spec.rb
 create mode 100644 spec/lib/gitlab/markdown/filter/user_reference_filter_spec.rb
 delete mode 100644 spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
 delete mode 100644 spec/lib/gitlab/markdown/label_reference_filter_spec.rb
 delete mode 100644 spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb
 delete mode 100644 spec/lib/gitlab/markdown/redactor_filter_spec.rb
 delete mode 100644 spec/lib/gitlab/markdown/reference_gatherer_filter_spec.rb
 delete mode 100644 spec/lib/gitlab/markdown/relative_link_filter_spec.rb
 delete mode 100644 spec/lib/gitlab/markdown/sanitization_filter_spec.rb
 delete mode 100644 spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
 delete mode 100644 spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb
 delete mode 100644 spec/lib/gitlab/markdown/table_of_contents_filter_spec.rb
 delete mode 100644 spec/lib/gitlab/markdown/task_list_filter_spec.rb
 delete mode 100644 spec/lib/gitlab/markdown/upload_link_filter_spec.rb
 delete mode 100644 spec/lib/gitlab/markdown/user_reference_filter_spec.rb

diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb
index 969607558ef..f4e2cefca51 100644
--- a/lib/gitlab/markdown.rb
+++ b/lib/gitlab/markdown.rb
@@ -33,7 +33,7 @@ module Gitlab
     end
 
     def self.render_result(text, context = {})
-      pipeline_by_name(context[:pipeline]).call(text, context)
+      Pipeline[context[:pipeline]].call(text, context)
     end
 
     # Perform post-processing on an HTML String
@@ -50,11 +50,9 @@ module Gitlab
     #
     # Returns an HTML-safe String
     def self.post_process(html, context)
-      pipeline = pipeline_by_name(context[:pipeline])
-      context = pipeline.transform_context(context)
-
-      pipeline = pipeline_by_name(:post_process)
+      context = Pipeline[context[:pipeline]].transform_context(context)
 
+      pipeline = Pipeline[:post_process]
       if context[:xhtml]
         pipeline.to_document(html, context).to_html(save_with: Nokogiri::XML::Node::SaveOptions::AS_XHTML)
       else
@@ -66,6 +64,7 @@ module Gitlab
 
     def self.cacheless_render(text, context = {})
       result = render_result(text, context)
+
       output = result[:output]
       if output.respond_to?(:to_html)
         output.to_html
@@ -76,48 +75,41 @@ module Gitlab
 
     def self.full_cache_key(cache_key, pipeline_name)
       return unless cache_key
-      pipeline_name ||= :full
-      ["markdown", *cache_key, pipeline_name]
-    end
-
-    def self.pipeline_by_name(pipeline_name)
-      pipeline_name ||= :full
-      const_get("#{pipeline_name.to_s.camelize}Pipeline")
+      ["markdown", *cache_key, pipeline_name || :full]
     end
 
     # Provide autoload paths for filters to prevent a circular dependency error
-    autoload :AutolinkFilter,               'gitlab/markdown/autolink_filter'
-    autoload :CommitRangeReferenceFilter,   'gitlab/markdown/commit_range_reference_filter'
-    autoload :CommitReferenceFilter,        'gitlab/markdown/commit_reference_filter'
-    autoload :EmojiFilter,                  'gitlab/markdown/emoji_filter'
-    autoload :ExternalIssueReferenceFilter, 'gitlab/markdown/external_issue_reference_filter'
-    autoload :ExternalLinkFilter,           'gitlab/markdown/external_link_filter'
-    autoload :IssueReferenceFilter,         'gitlab/markdown/issue_reference_filter'
-    autoload :LabelReferenceFilter,         'gitlab/markdown/label_reference_filter'
-    autoload :MarkdownFilter,               'gitlab/markdown/markdown_filter'
-    autoload :MergeRequestReferenceFilter,  'gitlab/markdown/merge_request_reference_filter'
-    autoload :RedactorFilter,               'gitlab/markdown/redactor_filter'
-    autoload :RelativeLinkFilter,           'gitlab/markdown/relative_link_filter'
-    autoload :SanitizationFilter,           'gitlab/markdown/sanitization_filter'
-    autoload :SnippetReferenceFilter,       'gitlab/markdown/snippet_reference_filter'
-    autoload :SyntaxHighlightFilter,        'gitlab/markdown/syntax_highlight_filter'
-    autoload :TableOfContentsFilter,        'gitlab/markdown/table_of_contents_filter'
-    autoload :TaskListFilter,               'gitlab/markdown/task_list_filter'
-    autoload :UserReferenceFilter,          'gitlab/markdown/user_reference_filter'
-    autoload :UploadLinkFilter,             'gitlab/markdown/upload_link_filter'
+    autoload :AutolinkFilter,               'gitlab/markdown/filter/autolink_filter'
+    autoload :CommitRangeReferenceFilter,   'gitlab/markdown/filter/commit_range_reference_filter'
+    autoload :CommitReferenceFilter,        'gitlab/markdown/filter/commit_reference_filter'
+    autoload :EmojiFilter,                  'gitlab/markdown/filter/emoji_filter'
+    autoload :ExternalIssueReferenceFilter, 'gitlab/markdown/filter/external_issue_reference_filter'
+    autoload :ExternalLinkFilter,           'gitlab/markdown/filter/external_link_filter'
+    autoload :IssueReferenceFilter,         'gitlab/markdown/filter/issue_reference_filter'
+    autoload :LabelReferenceFilter,         'gitlab/markdown/filter/label_reference_filter'
+    autoload :MarkdownFilter,               'gitlab/markdown/filter/markdown_filter'
+    autoload :MergeRequestReferenceFilter,  'gitlab/markdown/filter/merge_request_reference_filter'
+    autoload :RedactorFilter,               'gitlab/markdown/filter/redactor_filter'
+    autoload :ReferenceGathererFilter,      'gitlab/markdown/filter/reference_gatherer_filter'
+    autoload :RelativeLinkFilter,           'gitlab/markdown/filter/relative_link_filter'
+    autoload :SanitizationFilter,           'gitlab/markdown/filter/sanitization_filter'
+    autoload :SnippetReferenceFilter,       'gitlab/markdown/filter/snippet_reference_filter'
+    autoload :SyntaxHighlightFilter,        'gitlab/markdown/filter/syntax_highlight_filter'
+    autoload :TableOfContentsFilter,        'gitlab/markdown/filter/table_of_contents_filter'
+    autoload :TaskListFilter,               'gitlab/markdown/filter/task_list_filter'
+    autoload :UserReferenceFilter,          'gitlab/markdown/filter/user_reference_filter'
+    autoload :UploadLinkFilter,             'gitlab/markdown/filter/upload_link_filter'
 
-    autoload :AsciidocPipeline,             'gitlab/markdown/asciidoc_pipeline'
-    autoload :AtomPipeline,                 'gitlab/markdown/atom_pipeline'
-    autoload :CombinedPipeline,             'gitlab/markdown/combined_pipeline'
-    autoload :DescriptionPipeline,          'gitlab/markdown/description_pipeline'
-    autoload :EmailPipeline,                'gitlab/markdown/email_pipeline'
-    autoload :FullPipeline,                 'gitlab/markdown/full_pipeline'
-    autoload :GfmPipeline,                  'gitlab/markdown/gfm_pipeline'
-    autoload :NotePipeline,                 'gitlab/markdown/note_pipeline'
-    autoload :Pipeline,                     'gitlab/markdown/pipeline'
-    autoload :PlainMarkdownPipeline,        'gitlab/markdown/plain_markdown_pipeline'
-    autoload :PostProcessPipeline,          'gitlab/markdown/post_process_pipeline'
-    autoload :ReferenceExtractionPipeline,  'gitlab/markdown/reference_extraction_pipeline'
-    autoload :SingleLinePipeline,           'gitlab/markdown/single_line_pipeline'
+    autoload :AsciidocPipeline,             'gitlab/markdown/pipeline/asciidoc_pipeline'
+    autoload :AtomPipeline,                 'gitlab/markdown/pipeline/atom_pipeline'
+    autoload :DescriptionPipeline,          'gitlab/markdown/pipeline/description_pipeline'
+    autoload :EmailPipeline,                'gitlab/markdown/pipeline/email_pipeline'
+    autoload :FullPipeline,                 'gitlab/markdown/pipeline/full_pipeline'
+    autoload :GfmPipeline,                  'gitlab/markdown/pipeline/gfm_pipeline'
+    autoload :NotePipeline,                 'gitlab/markdown/pipeline/note_pipeline'
+    autoload :PlainMarkdownPipeline,        'gitlab/markdown/pipeline/plain_markdown_pipeline'
+    autoload :PostProcessPipeline,          'gitlab/markdown/pipeline/post_process_pipeline'
+    autoload :ReferenceExtractionPipeline,  'gitlab/markdown/pipeline/reference_extraction_pipeline'
+    autoload :SingleLinePipeline,           'gitlab/markdown/pipeline/single_line_pipeline'
   end
 end
diff --git a/lib/gitlab/markdown/asciidoc_pipeline.rb b/lib/gitlab/markdown/asciidoc_pipeline.rb
deleted file mode 100644
index 6829b4acb95..00000000000
--- a/lib/gitlab/markdown/asciidoc_pipeline.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'gitlab/markdown'
-
-module Gitlab
-  module Markdown
-    class AsciidocPipeline < Pipeline
-      def self.filters
-        [
-          Gitlab::Markdown::RelativeLinkFilter
-        ]
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/markdown/atom_pipeline.rb b/lib/gitlab/markdown/atom_pipeline.rb
deleted file mode 100644
index e151f8f5e5a..00000000000
--- a/lib/gitlab/markdown/atom_pipeline.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require 'gitlab/markdown'
-
-module Gitlab
-  module Markdown
-    class AtomPipeline < FullPipeline
-      def self.transform_context(context)
-        super(context).merge( 
-          only_path: false, 
-          xhtml: true 
-        )
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/markdown/autolink_filter.rb b/lib/gitlab/markdown/autolink_filter.rb
deleted file mode 100644
index c37c3bc55bf..00000000000
--- a/lib/gitlab/markdown/autolink_filter.rb
+++ /dev/null
@@ -1,107 +0,0 @@
-require 'gitlab/markdown'
-require 'html/pipeline/filter'
-require 'uri'
-
-module Gitlab
-  module Markdown
-    # HTML Filter for auto-linking URLs in HTML.
-    #
-    # Based on HTML::Pipeline::AutolinkFilter
-    #
-    # Context options:
-    #   :autolink  - Boolean, skips all processing done by this filter when false
-    #   :link_attr - Hash of attributes for the generated links
-    #
-    class AutolinkFilter < HTML::Pipeline::Filter
-      include ActionView::Helpers::TagHelper
-
-      # Pattern to match text that should be autolinked.
-      #
-      # A URI scheme begins with a letter and may contain letters, numbers,
-      # plus, period and hyphen. Schemes are case-insensitive but we're being
-      # picky here and allowing only lowercase for autolinks.
-      #
-      # See http://en.wikipedia.org/wiki/URI_scheme
-      #
-      # The negative lookbehind ensures that users can paste a URL followed by a
-      # period or comma for punctuation without those characters being included
-      # in the generated link.
-      #
-      # Rubular: http://rubular.com/r/cxjPyZc7Sb
-      LINK_PATTERN = %r{([a-z][a-z0-9\+\.-]+://\S+)(?<!,|\.)}
-
-      # Text matching LINK_PATTERN inside these elements will not be linked
-      IGNORE_PARENTS = %w(a code kbd pre script style).to_set
-
-      def call
-        return doc if context[:autolink] == false
-
-        rinku_parse
-        text_parse
-      end
-
-      private
-
-      # Run the text through Rinku as a first pass
-      #
-      # This will quickly autolink http(s) and ftp links.
-      #
-      # `@doc` will be re-parsed with the HTML String from Rinku.
-      def rinku_parse
-        # Convert the options from a Hash to a String that Rinku expects
-        options = tag_options(link_options)
-
-        # NOTE: We don't parse email links because it will erroneously match
-        # external Commit and CommitRange references.
-        #
-        # The final argument tells Rinku to link short URLs that don't include a
-        # period (e.g., http://localhost:3000/)
-        rinku = Rinku.auto_link(html, :urls, options, IGNORE_PARENTS.to_a, 1)
-
-        # Rinku returns a String, so parse it back to a Nokogiri::XML::Document
-        # for further processing.
-        @doc = parse_html(rinku)
-      end
-
-      # Autolinks any text matching LINK_PATTERN that Rinku didn't already
-      # replace
-      def text_parse
-        search_text_nodes(doc).each do |node|
-          content = node.to_html
-
-          next if has_ancestor?(node, IGNORE_PARENTS)
-          next unless content.match(LINK_PATTERN)
-
-          # If Rinku didn't link this, there's probably a good reason, so we'll
-          # skip it too
-          next if content.start_with?(*%w(http https ftp))
-
-          html = autolink_filter(content)
-
-          next if html == content
-
-          node.replace(html)
-        end
-
-        doc
-      end
-
-      def autolink_filter(text)
-        text.gsub(LINK_PATTERN) do |match|
-          # Remove any trailing HTML entities and store them for appending
-          # outside the link element. The entity must be marked HTML safe in
-          # order to be output literally rather than escaped.
-          match.gsub!(/((?:&[\w#]+;)+)\z/, '')
-          dropped = ($1 || '').html_safe
-
-          options = link_options.merge(href: match)
-          content_tag(:a, match, options) + dropped
-        end
-      end
-
-      def link_options
-        @link_options ||= context[:link_attr] || {}
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/markdown/commit_range_reference_filter.rb b/lib/gitlab/markdown/commit_range_reference_filter.rb
deleted file mode 100644
index e070edae0a4..00000000000
--- a/lib/gitlab/markdown/commit_range_reference_filter.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-require 'gitlab/markdown'
-
-module Gitlab
-  module Markdown
-    # HTML filter that replaces commit range references with links.
-    #
-    # This filter supports cross-project references.
-    class CommitRangeReferenceFilter < ReferenceFilter
-      include CrossProjectReference
-
-      # Public: Find commit range references in text
-      #
-      #   CommitRangeReferenceFilter.references_in(text) do |match, commit_range, project_ref|
-      #     "<a href=...>#{commit_range}</a>"
-      #   end
-      #
-      # text - String text to search.
-      #
-      # Yields the String match, the String commit range, and an optional String
-      # of the external project reference.
-      #
-      # Returns a String replaced with the return of the block.
-      def self.references_in(text)
-        text.gsub(CommitRange.reference_pattern) do |match|
-          yield match, $~[:commit_range], $~[:project]
-        end
-      end
-
-      def self.referenced_by(node)
-        project = Project.find(node.attr("data-project")) rescue nil
-        return unless project
-
-        id = node.attr("data-commit-range")
-        range = CommitRange.new(id, project)
-
-        return unless range.valid_commits?
-
-        { commit_range: range }
-      end
-
-      def initialize(*args)
-        super
-
-        @commit_map = {}
-      end
-
-      def call
-        replace_text_nodes_matching(CommitRange.reference_pattern) do |content|
-          commit_range_link_filter(content)
-        end
-      end
-
-      # Replace commit range references in text with links to compare the commit
-      # ranges.
-      #
-      # text - String text to replace references in.
-      #
-      # Returns a String with commit range references replaced with links. All
-      # links have `gfm` and `gfm-commit_range` class names attached for
-      # styling.
-      def commit_range_link_filter(text)
-        self.class.references_in(text) do |match, id, project_ref|
-          project = self.project_from_ref(project_ref)
-
-          range = CommitRange.new(id, project)
-
-          if range.valid_commits?
-            url = url_for_commit_range(project, range)
-
-            title = range.reference_title
-            klass = reference_class(:commit_range)
-            data  = data_attribute(project: project.id, commit_range: id)
-
-            project_ref += '@' if project_ref
-
-            %(<a href="#{url}" #{data}
-                 title="#{title}"
-                 class="#{klass}">#{project_ref}#{range}</a>)
-          else
-            match
-          end
-        end
-      end
-
-      def url_for_commit_range(project, range)
-        h = Gitlab::Application.routes.url_helpers
-        h.namespace_project_compare_url(project.namespace, project,
-                                        range.to_param.merge(only_path: context[:only_path]))
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/markdown/commit_reference_filter.rb b/lib/gitlab/markdown/commit_reference_filter.rb
deleted file mode 100644
index 8cdbeb1f9cf..00000000000
--- a/lib/gitlab/markdown/commit_reference_filter.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-require 'gitlab/markdown'
-
-module Gitlab
-  module Markdown
-    # HTML filter that replaces commit references with links.
-    #
-    # This filter supports cross-project references.
-    class CommitReferenceFilter < ReferenceFilter
-      include CrossProjectReference
-
-      # Public: Find commit references in text
-      #
-      #   CommitReferenceFilter.references_in(text) do |match, commit, project_ref|
-      #     "<a href=...>#{commit}</a>"
-      #   end
-      #
-      # text - String text to search.
-      #
-      # Yields the String match, the String commit identifier, and an optional
-      # String of the external project reference.
-      #
-      # Returns a String replaced with the return of the block.
-      def self.references_in(text)
-        text.gsub(Commit.reference_pattern) do |match|
-          yield match, $~[:commit], $~[:project]
-        end
-      end
-
-      def self.referenced_by(node)
-        project = Project.find(node.attr("data-project")) rescue nil
-        return unless project
-
-        id = node.attr("data-commit")
-        commit = commit_from_ref(project, id)
-
-        return unless commit
-
-        { commit: commit }
-      end
-
-      def call
-        replace_text_nodes_matching(Commit.reference_pattern) do |content|
-          commit_link_filter(content)
-        end
-      end
-
-      # Replace commit references in text with links to the commit specified.
-      #
-      # text - String text to replace references in.
-      #
-      # Returns a String with commit references replaced with links. All links
-      # have `gfm` and `gfm-commit` class names attached for styling.
-      def commit_link_filter(text)
-        self.class.references_in(text) do |match, id, project_ref|
-          project = self.project_from_ref(project_ref)
-
-          if commit = self.class.commit_from_ref(project, id)
-            url = url_for_commit(project, commit)
-
-            title = escape_once(commit.link_title)
-            klass = reference_class(:commit)
-            data  = data_attribute(project: project.id, commit: id)
-
-            project_ref += '@' if project_ref
-
-            %(<a href="#{url}" #{data}
-                 title="#{title}"
-                 class="#{klass}">#{project_ref}#{commit.short_id}</a>)
-          else
-            match
-          end
-        end
-      end
-
-      def self.commit_from_ref(project, id)
-        if project && project.valid_repo?
-          project.commit(id)
-        end
-      end
-
-      def url_for_commit(project, commit)
-        h = Gitlab::Application.routes.url_helpers
-        h.namespace_project_commit_url(project.namespace, project, commit,
-                                        only_path: context[:only_path])
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/markdown/description_pipeline.rb b/lib/gitlab/markdown/description_pipeline.rb
deleted file mode 100644
index 76f6948af8f..00000000000
--- a/lib/gitlab/markdown/description_pipeline.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require 'gitlab/markdown'
-
-module Gitlab
-  module Markdown
-    class DescriptionPipeline < FullPipeline
-      def self.transform_context(context)
-        super(context).merge( 
-          # SanitizationFilter
-          inline_sanitization: true
-        )
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/markdown/email_pipeline.rb b/lib/gitlab/markdown/email_pipeline.rb
deleted file mode 100644
index b88cb790270..00000000000
--- a/lib/gitlab/markdown/email_pipeline.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'gitlab/markdown'
-
-module Gitlab
-  module Markdown
-    class EmailPipeline < FullPipeline
-      def self.transform_context(context)
-        super(context).merge( 
-          only_path: false
-        )
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/markdown/emoji_filter.rb b/lib/gitlab/markdown/emoji_filter.rb
deleted file mode 100644
index da10e4d3760..00000000000
--- a/lib/gitlab/markdown/emoji_filter.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-require 'action_controller'
-require 'gitlab/markdown'
-require 'gitlab_emoji'
-require 'html/pipeline/filter'
-
-module Gitlab
-  module Markdown
-    # HTML filter that replaces :emoji: with images.
-    #
-    # Based on HTML::Pipeline::EmojiFilter
-    #
-    # Context options:
-    #   :asset_root
-    #   :asset_host
-    class EmojiFilter < HTML::Pipeline::Filter
-      IGNORED_ANCESTOR_TAGS = %w(pre code tt).to_set
-
-      def call
-        search_text_nodes(doc).each do |node|
-          content = node.to_html
-          next unless content.include?(':')
-          next if has_ancestor?(node, IGNORED_ANCESTOR_TAGS)
-
-          html = emoji_image_filter(content)
-
-          next if html == content
-
-          node.replace(html)
-        end
-
-        doc
-      end
-
-      # Replace :emoji: with corresponding images.
-      #
-      # text - String text to replace :emoji: in.
-      #
-      # Returns a String with :emoji: replaced with images.
-      def emoji_image_filter(text)
-        text.gsub(emoji_pattern) do |match|
-          name = $1
-          "<img class='emoji' title=':#{name}:' alt=':#{name}:' src='#{emoji_url(name)}' height='20' width='20' align='absmiddle' />"
-        end
-      end
-
-      private
-
-      def emoji_url(name)
-        emoji_path = "emoji/#{emoji_filename(name)}"
-        if context[:asset_host]
-          # Asset host is specified.
-          url_to_image(emoji_path)
-        elsif context[:asset_root]
-          # Gitlab url is specified
-          File.join(context[:asset_root], url_to_image(emoji_path))
-        else
-          # All other cases
-          url_to_image(emoji_path)
-        end
-      end
-
-      def url_to_image(image)
-        ActionController::Base.helpers.url_to_image(image)
-      end
-
-      # Build a regexp that matches all valid :emoji: names.
-      def self.emoji_pattern
-        @emoji_pattern ||= /:(#{Emoji.emojis_names.map { |name| Regexp.escape(name) }.join('|')}):/
-      end
-
-      def emoji_pattern
-        self.class.emoji_pattern
-      end
-
-      def emoji_filename(name)
-        "#{Emoji.emoji_filename(name)}.png"
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/markdown/external_issue_reference_filter.rb b/lib/gitlab/markdown/external_issue_reference_filter.rb
deleted file mode 100644
index 8f86f13976a..00000000000
--- a/lib/gitlab/markdown/external_issue_reference_filter.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-require 'gitlab/markdown'
-
-module Gitlab
-  module Markdown
-    # HTML filter that replaces external issue tracker references with links.
-    # References are ignored if the project doesn't use an external issue
-    # tracker.
-    class ExternalIssueReferenceFilter < ReferenceFilter
-      # Public: Find `JIRA-123` issue references in text
-      #
-      #   ExternalIssueReferenceFilter.references_in(text) do |match, issue|
-      #     "<a href=...>##{issue}</a>"
-      #   end
-      #
-      # text - String text to search.
-      #
-      # Yields the String match and the String issue reference.
-      #
-      # Returns a String replaced with the return of the block.
-      def self.references_in(text)
-        text.gsub(ExternalIssue.reference_pattern) do |match|
-          yield match, $~[:issue]
-        end
-      end
-
-      def call
-        # Early return if the project isn't using an external tracker
-        return doc if project.nil? || project.default_issues_tracker?
-
-        replace_text_nodes_matching(ExternalIssue.reference_pattern) do |content|
-          issue_link_filter(content)
-        end
-      end
-
-      # Replace `JIRA-123` issue references in text with links to the referenced
-      # issue's details page.
-      #
-      # text - String text to replace references in.
-      #
-      # Returns a String with `JIRA-123` references replaced with links. All
-      # links have `gfm` and `gfm-issue` class names attached for styling.
-      def issue_link_filter(text)
-        project = context[:project]
-
-        self.class.references_in(text) do |match, issue|
-          url = url_for_issue(issue, project, only_path: context[:only_path])
-
-          title = escape_once("Issue in #{project.external_issue_tracker.title}")
-          klass = reference_class(:issue)
-          data  = data_attribute(project: project.id)
-
-          %(<a href="#{url}" #{data}
-               title="#{title}"
-               class="#{klass}">#{match}</a>)
-        end
-      end
-
-      def url_for_issue(*args)
-        IssuesHelper.url_for_issue(*args)
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/markdown/external_link_filter.rb b/lib/gitlab/markdown/external_link_filter.rb
deleted file mode 100644
index 29e51b6ade6..00000000000
--- a/lib/gitlab/markdown/external_link_filter.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-require 'gitlab/markdown'
-require 'html/pipeline/filter'
-
-module Gitlab
-  module Markdown
-    # HTML Filter to add a `rel="nofollow"` attribute to external links
-    #
-    class ExternalLinkFilter < HTML::Pipeline::Filter
-      def call
-        doc.search('a').each do |node|
-          next unless node.has_attribute?('href')
-
-          link = node.attribute('href').value
-
-          # Skip non-HTTP(S) links
-          next unless link.start_with?('http')
-
-          # Skip internal links
-          next if link.start_with?(internal_url)
-
-          node.set_attribute('rel', 'nofollow')
-        end
-
-        doc
-      end
-
-      private
-
-      def internal_url
-        @internal_url ||= Gitlab.config.gitlab.url
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/markdown/filter/autolink_filter.rb b/lib/gitlab/markdown/filter/autolink_filter.rb
new file mode 100644
index 00000000000..c37c3bc55bf
--- /dev/null
+++ b/lib/gitlab/markdown/filter/autolink_filter.rb
@@ -0,0 +1,107 @@
+require 'gitlab/markdown'
+require 'html/pipeline/filter'
+require 'uri'
+
+module Gitlab
+  module Markdown
+    # HTML Filter for auto-linking URLs in HTML.
+    #
+    # Based on HTML::Pipeline::AutolinkFilter
+    #
+    # Context options:
+    #   :autolink  - Boolean, skips all processing done by this filter when false
+    #   :link_attr - Hash of attributes for the generated links
+    #
+    class AutolinkFilter < HTML::Pipeline::Filter
+      include ActionView::Helpers::TagHelper
+
+      # Pattern to match text that should be autolinked.
+      #
+      # A URI scheme begins with a letter and may contain letters, numbers,
+      # plus, period and hyphen. Schemes are case-insensitive but we're being
+      # picky here and allowing only lowercase for autolinks.
+      #
+      # See http://en.wikipedia.org/wiki/URI_scheme
+      #
+      # The negative lookbehind ensures that users can paste a URL followed by a
+      # period or comma for punctuation without those characters being included
+      # in the generated link.
+      #
+      # Rubular: http://rubular.com/r/cxjPyZc7Sb
+      LINK_PATTERN = %r{([a-z][a-z0-9\+\.-]+://\S+)(?<!,|\.)}
+
+      # Text matching LINK_PATTERN inside these elements will not be linked
+      IGNORE_PARENTS = %w(a code kbd pre script style).to_set
+
+      def call
+        return doc if context[:autolink] == false
+
+        rinku_parse
+        text_parse
+      end
+
+      private
+
+      # Run the text through Rinku as a first pass
+      #
+      # This will quickly autolink http(s) and ftp links.
+      #
+      # `@doc` will be re-parsed with the HTML String from Rinku.
+      def rinku_parse
+        # Convert the options from a Hash to a String that Rinku expects
+        options = tag_options(link_options)
+
+        # NOTE: We don't parse email links because it will erroneously match
+        # external Commit and CommitRange references.
+        #
+        # The final argument tells Rinku to link short URLs that don't include a
+        # period (e.g., http://localhost:3000/)
+        rinku = Rinku.auto_link(html, :urls, options, IGNORE_PARENTS.to_a, 1)
+
+        # Rinku returns a String, so parse it back to a Nokogiri::XML::Document
+        # for further processing.
+        @doc = parse_html(rinku)
+      end
+
+      # Autolinks any text matching LINK_PATTERN that Rinku didn't already
+      # replace
+      def text_parse
+        search_text_nodes(doc).each do |node|
+          content = node.to_html
+
+          next if has_ancestor?(node, IGNORE_PARENTS)
+          next unless content.match(LINK_PATTERN)
+
+          # If Rinku didn't link this, there's probably a good reason, so we'll
+          # skip it too
+          next if content.start_with?(*%w(http https ftp))
+
+          html = autolink_filter(content)
+
+          next if html == content
+
+          node.replace(html)
+        end
+
+        doc
+      end
+
+      def autolink_filter(text)
+        text.gsub(LINK_PATTERN) do |match|
+          # Remove any trailing HTML entities and store them for appending
+          # outside the link element. The entity must be marked HTML safe in
+          # order to be output literally rather than escaped.
+          match.gsub!(/((?:&[\w#]+;)+)\z/, '')
+          dropped = ($1 || '').html_safe
+
+          options = link_options.merge(href: match)
+          content_tag(:a, match, options) + dropped
+        end
+      end
+
+      def link_options
+        @link_options ||= context[:link_attr] || {}
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/filter/commit_range_reference_filter.rb b/lib/gitlab/markdown/filter/commit_range_reference_filter.rb
new file mode 100644
index 00000000000..e070edae0a4
--- /dev/null
+++ b/lib/gitlab/markdown/filter/commit_range_reference_filter.rb
@@ -0,0 +1,92 @@
+require 'gitlab/markdown'
+
+module Gitlab
+  module Markdown
+    # HTML filter that replaces commit range references with links.
+    #
+    # This filter supports cross-project references.
+    class CommitRangeReferenceFilter < ReferenceFilter
+      include CrossProjectReference
+
+      # Public: Find commit range references in text
+      #
+      #   CommitRangeReferenceFilter.references_in(text) do |match, commit_range, project_ref|
+      #     "<a href=...>#{commit_range}</a>"
+      #   end
+      #
+      # text - String text to search.
+      #
+      # Yields the String match, the String commit range, and an optional String
+      # of the external project reference.
+      #
+      # Returns a String replaced with the return of the block.
+      def self.references_in(text)
+        text.gsub(CommitRange.reference_pattern) do |match|
+          yield match, $~[:commit_range], $~[:project]
+        end
+      end
+
+      def self.referenced_by(node)
+        project = Project.find(node.attr("data-project")) rescue nil
+        return unless project
+
+        id = node.attr("data-commit-range")
+        range = CommitRange.new(id, project)
+
+        return unless range.valid_commits?
+
+        { commit_range: range }
+      end
+
+      def initialize(*args)
+        super
+
+        @commit_map = {}
+      end
+
+      def call
+        replace_text_nodes_matching(CommitRange.reference_pattern) do |content|
+          commit_range_link_filter(content)
+        end
+      end
+
+      # Replace commit range references in text with links to compare the commit
+      # ranges.
+      #
+      # text - String text to replace references in.
+      #
+      # Returns a String with commit range references replaced with links. All
+      # links have `gfm` and `gfm-commit_range` class names attached for
+      # styling.
+      def commit_range_link_filter(text)
+        self.class.references_in(text) do |match, id, project_ref|
+          project = self.project_from_ref(project_ref)
+
+          range = CommitRange.new(id, project)
+
+          if range.valid_commits?
+            url = url_for_commit_range(project, range)
+
+            title = range.reference_title
+            klass = reference_class(:commit_range)
+            data  = data_attribute(project: project.id, commit_range: id)
+
+            project_ref += '@' if project_ref
+
+            %(<a href="#{url}" #{data}
+                 title="#{title}"
+                 class="#{klass}">#{project_ref}#{range}</a>)
+          else
+            match
+          end
+        end
+      end
+
+      def url_for_commit_range(project, range)
+        h = Gitlab::Application.routes.url_helpers
+        h.namespace_project_compare_url(project.namespace, project,
+                                        range.to_param.merge(only_path: context[:only_path]))
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/filter/commit_reference_filter.rb b/lib/gitlab/markdown/filter/commit_reference_filter.rb
new file mode 100644
index 00000000000..8cdbeb1f9cf
--- /dev/null
+++ b/lib/gitlab/markdown/filter/commit_reference_filter.rb
@@ -0,0 +1,88 @@
+require 'gitlab/markdown'
+
+module Gitlab
+  module Markdown
+    # HTML filter that replaces commit references with links.
+    #
+    # This filter supports cross-project references.
+    class CommitReferenceFilter < ReferenceFilter
+      include CrossProjectReference
+
+      # Public: Find commit references in text
+      #
+      #   CommitReferenceFilter.references_in(text) do |match, commit, project_ref|
+      #     "<a href=...>#{commit}</a>"
+      #   end
+      #
+      # text - String text to search.
+      #
+      # Yields the String match, the String commit identifier, and an optional
+      # String of the external project reference.
+      #
+      # Returns a String replaced with the return of the block.
+      def self.references_in(text)
+        text.gsub(Commit.reference_pattern) do |match|
+          yield match, $~[:commit], $~[:project]
+        end
+      end
+
+      def self.referenced_by(node)
+        project = Project.find(node.attr("data-project")) rescue nil
+        return unless project
+
+        id = node.attr("data-commit")
+        commit = commit_from_ref(project, id)
+
+        return unless commit
+
+        { commit: commit }
+      end
+
+      def call
+        replace_text_nodes_matching(Commit.reference_pattern) do |content|
+          commit_link_filter(content)
+        end
+      end
+
+      # Replace commit references in text with links to the commit specified.
+      #
+      # text - String text to replace references in.
+      #
+      # Returns a String with commit references replaced with links. All links
+      # have `gfm` and `gfm-commit` class names attached for styling.
+      def commit_link_filter(text)
+        self.class.references_in(text) do |match, id, project_ref|
+          project = self.project_from_ref(project_ref)
+
+          if commit = self.class.commit_from_ref(project, id)
+            url = url_for_commit(project, commit)
+
+            title = escape_once(commit.link_title)
+            klass = reference_class(:commit)
+            data  = data_attribute(project: project.id, commit: id)
+
+            project_ref += '@' if project_ref
+
+            %(<a href="#{url}" #{data}
+                 title="#{title}"
+                 class="#{klass}">#{project_ref}#{commit.short_id}</a>)
+          else
+            match
+          end
+        end
+      end
+
+      def self.commit_from_ref(project, id)
+        if project && project.valid_repo?
+          project.commit(id)
+        end
+      end
+
+      def url_for_commit(project, commit)
+        h = Gitlab::Application.routes.url_helpers
+        h.namespace_project_commit_url(project.namespace, project, commit,
+                                        only_path: context[:only_path])
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/filter/emoji_filter.rb b/lib/gitlab/markdown/filter/emoji_filter.rb
new file mode 100644
index 00000000000..da10e4d3760
--- /dev/null
+++ b/lib/gitlab/markdown/filter/emoji_filter.rb
@@ -0,0 +1,80 @@
+require 'action_controller'
+require 'gitlab/markdown'
+require 'gitlab_emoji'
+require 'html/pipeline/filter'
+
+module Gitlab
+  module Markdown
+    # HTML filter that replaces :emoji: with images.
+    #
+    # Based on HTML::Pipeline::EmojiFilter
+    #
+    # Context options:
+    #   :asset_root
+    #   :asset_host
+    class EmojiFilter < HTML::Pipeline::Filter
+      IGNORED_ANCESTOR_TAGS = %w(pre code tt).to_set
+
+      def call
+        search_text_nodes(doc).each do |node|
+          content = node.to_html
+          next unless content.include?(':')
+          next if has_ancestor?(node, IGNORED_ANCESTOR_TAGS)
+
+          html = emoji_image_filter(content)
+
+          next if html == content
+
+          node.replace(html)
+        end
+
+        doc
+      end
+
+      # Replace :emoji: with corresponding images.
+      #
+      # text - String text to replace :emoji: in.
+      #
+      # Returns a String with :emoji: replaced with images.
+      def emoji_image_filter(text)
+        text.gsub(emoji_pattern) do |match|
+          name = $1
+          "<img class='emoji' title=':#{name}:' alt=':#{name}:' src='#{emoji_url(name)}' height='20' width='20' align='absmiddle' />"
+        end
+      end
+
+      private
+
+      def emoji_url(name)
+        emoji_path = "emoji/#{emoji_filename(name)}"
+        if context[:asset_host]
+          # Asset host is specified.
+          url_to_image(emoji_path)
+        elsif context[:asset_root]
+          # Gitlab url is specified
+          File.join(context[:asset_root], url_to_image(emoji_path))
+        else
+          # All other cases
+          url_to_image(emoji_path)
+        end
+      end
+
+      def url_to_image(image)
+        ActionController::Base.helpers.url_to_image(image)
+      end
+
+      # Build a regexp that matches all valid :emoji: names.
+      def self.emoji_pattern
+        @emoji_pattern ||= /:(#{Emoji.emojis_names.map { |name| Regexp.escape(name) }.join('|')}):/
+      end
+
+      def emoji_pattern
+        self.class.emoji_pattern
+      end
+
+      def emoji_filename(name)
+        "#{Emoji.emoji_filename(name)}.png"
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/filter/external_issue_reference_filter.rb b/lib/gitlab/markdown/filter/external_issue_reference_filter.rb
new file mode 100644
index 00000000000..8f86f13976a
--- /dev/null
+++ b/lib/gitlab/markdown/filter/external_issue_reference_filter.rb
@@ -0,0 +1,63 @@
+require 'gitlab/markdown'
+
+module Gitlab
+  module Markdown
+    # HTML filter that replaces external issue tracker references with links.
+    # References are ignored if the project doesn't use an external issue
+    # tracker.
+    class ExternalIssueReferenceFilter < ReferenceFilter
+      # Public: Find `JIRA-123` issue references in text
+      #
+      #   ExternalIssueReferenceFilter.references_in(text) do |match, issue|
+      #     "<a href=...>##{issue}</a>"
+      #   end
+      #
+      # text - String text to search.
+      #
+      # Yields the String match and the String issue reference.
+      #
+      # Returns a String replaced with the return of the block.
+      def self.references_in(text)
+        text.gsub(ExternalIssue.reference_pattern) do |match|
+          yield match, $~[:issue]
+        end
+      end
+
+      def call
+        # Early return if the project isn't using an external tracker
+        return doc if project.nil? || project.default_issues_tracker?
+
+        replace_text_nodes_matching(ExternalIssue.reference_pattern) do |content|
+          issue_link_filter(content)
+        end
+      end
+
+      # Replace `JIRA-123` issue references in text with links to the referenced
+      # issue's details page.
+      #
+      # text - String text to replace references in.
+      #
+      # Returns a String with `JIRA-123` references replaced with links. All
+      # links have `gfm` and `gfm-issue` class names attached for styling.
+      def issue_link_filter(text)
+        project = context[:project]
+
+        self.class.references_in(text) do |match, issue|
+          url = url_for_issue(issue, project, only_path: context[:only_path])
+
+          title = escape_once("Issue in #{project.external_issue_tracker.title}")
+          klass = reference_class(:issue)
+          data  = data_attribute(project: project.id)
+
+          %(<a href="#{url}" #{data}
+               title="#{title}"
+               class="#{klass}">#{match}</a>)
+        end
+      end
+
+      def url_for_issue(*args)
+        IssuesHelper.url_for_issue(*args)
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/filter/external_link_filter.rb b/lib/gitlab/markdown/filter/external_link_filter.rb
new file mode 100644
index 00000000000..29e51b6ade6
--- /dev/null
+++ b/lib/gitlab/markdown/filter/external_link_filter.rb
@@ -0,0 +1,34 @@
+require 'gitlab/markdown'
+require 'html/pipeline/filter'
+
+module Gitlab
+  module Markdown
+    # HTML Filter to add a `rel="nofollow"` attribute to external links
+    #
+    class ExternalLinkFilter < HTML::Pipeline::Filter
+      def call
+        doc.search('a').each do |node|
+          next unless node.has_attribute?('href')
+
+          link = node.attribute('href').value
+
+          # Skip non-HTTP(S) links
+          next unless link.start_with?('http')
+
+          # Skip internal links
+          next if link.start_with?(internal_url)
+
+          node.set_attribute('rel', 'nofollow')
+        end
+
+        doc
+      end
+
+      private
+
+      def internal_url
+        @internal_url ||= Gitlab.config.gitlab.url
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/filter/issue_reference_filter.rb b/lib/gitlab/markdown/filter/issue_reference_filter.rb
new file mode 100644
index 00000000000..1ed69e2f431
--- /dev/null
+++ b/lib/gitlab/markdown/filter/issue_reference_filter.rb
@@ -0,0 +1,23 @@
+require 'gitlab/markdown'
+
+module Gitlab
+  module Markdown
+    # HTML filter that replaces issue references with links. References to
+    # issues that do not exist are ignored.
+    #
+    # This filter supports cross-project references.
+    class IssueReferenceFilter < AbstractReferenceFilter
+      def self.object_class
+        Issue
+      end
+
+      def find_object(project, id)
+        project.get_issue(id)
+      end
+
+      def url_for_object(issue, project)
+        IssuesHelper.url_for_issue(issue.iid, project, only_path: context[:only_path])
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/filter/label_reference_filter.rb b/lib/gitlab/markdown/filter/label_reference_filter.rb
new file mode 100644
index 00000000000..618acb7a578
--- /dev/null
+++ b/lib/gitlab/markdown/filter/label_reference_filter.rb
@@ -0,0 +1,87 @@
+require 'gitlab/markdown'
+
+module Gitlab
+  module Markdown
+    # HTML filter that replaces label references with links.
+    class LabelReferenceFilter < ReferenceFilter
+      # Public: Find label references in text
+      #
+      #   LabelReferenceFilter.references_in(text) do |match, id, name|
+      #     "<a href=...>#{Label.find(id)}</a>"
+      #   end
+      #
+      # text - String text to search.
+      #
+      # Yields the String match, an optional Integer label ID, and an optional
+      # String label name.
+      #
+      # Returns a String replaced with the return of the block.
+      def self.references_in(text)
+        text.gsub(Label.reference_pattern) do |match|
+          yield match, $~[:label_id].to_i, $~[:label_name]
+        end
+      end
+
+      def self.referenced_by(node)
+        { label: LazyReference.new(Label, node.attr("data-label")) }
+      end
+
+      def call
+        replace_text_nodes_matching(Label.reference_pattern) do |content|
+          label_link_filter(content)
+        end
+      end
+
+      # Replace label references in text with links to the label specified.
+      #
+      # text - String text to replace references in.
+      #
+      # Returns a String with label references replaced with links. All links
+      # have `gfm` and `gfm-label` class names attached for styling.
+      def label_link_filter(text)
+        project = context[:project]
+
+        self.class.references_in(text) do |match, id, name|
+          params = label_params(id, name)
+
+          if label = project.labels.find_by(params)
+            url = url_for_label(project, label)
+            klass = reference_class(:label)
+            data = data_attribute(project: project.id, label: label.id)
+
+            %(<a href="#{url}" #{data}
+                 class="#{klass}">#{render_colored_label(label)}</a>)
+          else
+            match
+          end
+        end
+      end
+
+      def url_for_label(project, label)
+        h = Gitlab::Application.routes.url_helpers
+        h.namespace_project_issues_path(project.namespace, project,
+                                        label_name: label.name,
+                                        only_path: context[:only_path])
+      end
+
+      def render_colored_label(label)
+        LabelsHelper.render_colored_label(label)
+      end
+
+      # Parameters to pass to `Label.find_by` based on the given arguments
+      #
+      # id   - Integer ID to pass. If present, returns {id: id}
+      # name - String name to pass. If `id` is absent, finds by name without
+      #        surrounding quotes.
+      #
+      # Returns a Hash.
+      def label_params(id, name)
+        if name
+          { name: name.tr('"', '') }
+        else
+          { id: id }
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/filter/markdown_filter.rb b/lib/gitlab/markdown/filter/markdown_filter.rb
new file mode 100644
index 00000000000..921e2a0794e
--- /dev/null
+++ b/lib/gitlab/markdown/filter/markdown_filter.rb
@@ -0,0 +1,39 @@
+module Gitlab
+  module Markdown
+    class MarkdownFilter < HTML::Pipeline::TextFilter
+      def initialize(text, context = nil, result = nil)
+        super text, context, result
+        @text = @text.gsub "\r", ''
+      end
+
+      def call
+        html = self.class.renderer.render(@text)
+        html.rstrip!
+        html
+      end
+  
+      private      
+
+      def self.redcarpet_options
+        # https://github.com/vmg/redcarpet#and-its-like-really-simple-to-use
+        @redcarpet_options ||= {
+          fenced_code_blocks:  true,
+          footnotes:           true,
+          lax_spacing:         true,
+          no_intra_emphasis:   true,
+          space_after_headers: true,
+          strikethrough:       true,
+          superscript:         true,
+          tables:              true
+        }.freeze
+      end
+
+      def self.renderer
+        @renderer ||= begin
+          renderer = Redcarpet::Render::HTML.new
+          Redcarpet::Markdown.new(renderer, redcarpet_options)
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/filter/merge_request_reference_filter.rb b/lib/gitlab/markdown/filter/merge_request_reference_filter.rb
new file mode 100644
index 00000000000..1f47f03c94e
--- /dev/null
+++ b/lib/gitlab/markdown/filter/merge_request_reference_filter.rb
@@ -0,0 +1,25 @@
+require 'gitlab/markdown'
+
+module Gitlab
+  module Markdown
+    # HTML filter that replaces merge request references with links. References
+    # to merge requests that do not exist are ignored.
+    #
+    # This filter supports cross-project references.
+    class MergeRequestReferenceFilter < AbstractReferenceFilter
+      def self.object_class
+        MergeRequest
+      end
+
+      def find_object(project, id)
+        project.merge_requests.find_by(iid: id)
+      end
+
+      def url_for_object(mr, project)
+        h = Gitlab::Application.routes.url_helpers
+        h.namespace_project_merge_request_url(project.namespace, project, mr,
+                                            only_path: context[:only_path])
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/filter/redactor_filter.rb b/lib/gitlab/markdown/filter/redactor_filter.rb
new file mode 100644
index 00000000000..a1f3a8a8ebf
--- /dev/null
+++ b/lib/gitlab/markdown/filter/redactor_filter.rb
@@ -0,0 +1,40 @@
+require 'gitlab/markdown'
+require 'html/pipeline/filter'
+
+module Gitlab
+  module Markdown
+    # HTML filter that removes references to records that the current user does
+    # not have permission to view.
+    #
+    # Expected to be run in its own post-processing pipeline.
+    #
+    class RedactorFilter < HTML::Pipeline::Filter
+      def call
+        doc.css('a.gfm').each do |node|
+          unless user_can_reference?(node)
+            node.replace(node.text)
+          end
+        end
+
+        doc
+      end
+
+      private
+
+      def user_can_reference?(node)
+        if node.has_attribute?('data-reference-filter')
+          reference_type = node.attr('data-reference-filter')
+          reference_filter = reference_type.constantize
+
+          reference_filter.user_can_reference?(current_user, node, context)
+        else
+          true
+        end
+      end
+
+      def current_user
+        context[:current_user]
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/filter/reference_gatherer_filter.rb b/lib/gitlab/markdown/filter/reference_gatherer_filter.rb
new file mode 100644
index 00000000000..00f983675e6
--- /dev/null
+++ b/lib/gitlab/markdown/filter/reference_gatherer_filter.rb
@@ -0,0 +1,63 @@
+require 'gitlab/markdown'
+require 'html/pipeline/filter'
+
+module Gitlab
+  module Markdown
+    # HTML filter that gathers all referenced records that the current user has
+    # permission to view.
+    #
+    # Expected to be run in its own post-processing pipeline.
+    #
+    class ReferenceGathererFilter < HTML::Pipeline::Filter
+      def initialize(*)
+        super
+
+        result[:references] ||= Hash.new { |hash, type| hash[type] = [] }
+      end
+
+      def call
+        doc.css('a.gfm').each do |node|
+          gather_references(node)
+        end
+
+        load_lazy_references unless context[:load_lazy_references] == false
+
+        doc
+      end
+
+      private
+
+      def gather_references(node)
+        return unless node.has_attribute?('data-reference-filter')
+
+        reference_type = node.attr('data-reference-filter')
+        reference_filter = reference_type.constantize
+
+        return if context[:reference_filter] && reference_filter != context[:reference_filter]
+
+        return unless reference_filter.user_can_reference?(current_user, node, context)
+
+        references = reference_filter.referenced_by(node)
+        return unless references
+
+        references.each do |type, values|
+          Array.wrap(values).each do |value|
+            result[:references][type] << value
+          end
+        end
+      end
+
+      # Will load all references of one type using one query.
+      def load_lazy_references
+        refs = result[:references]
+        refs.each do |type, values|
+          refs[type] = ReferenceFilter::LazyReference.load(values)
+        end
+      end
+
+      def current_user
+        context[:current_user]
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/filter/relative_link_filter.rb b/lib/gitlab/markdown/filter/relative_link_filter.rb
new file mode 100644
index 00000000000..81f60120fcd
--- /dev/null
+++ b/lib/gitlab/markdown/filter/relative_link_filter.rb
@@ -0,0 +1,157 @@
+require 'gitlab/markdown'
+require 'html/pipeline/filter'
+require 'uri'
+
+module Gitlab
+  module Markdown
+    # HTML filter that "fixes" relative links to files in a repository.
+    #
+    # Context options:
+    #   :commit
+    #   :project
+    #   :project_wiki
+    #   :ref
+    #   :requested_path
+    class RelativeLinkFilter < HTML::Pipeline::Filter
+      def call
+        return doc unless linkable_files?
+
+        doc.search('a:not(.gfm)').each do |el|
+          process_link_attr el.attribute('href')
+        end
+
+        doc.search('img').each do |el|
+          process_link_attr el.attribute('src')
+        end
+
+        doc
+      end
+
+      protected
+
+      def linkable_files?
+        context[:project_wiki].nil? && repository.try(:exists?) && !repository.empty?
+      end
+
+      def process_link_attr(html_attr)
+        return if html_attr.blank?
+
+        uri = URI(html_attr.value)
+        if uri.relative? && uri.path.present?
+          html_attr.value = rebuild_relative_uri(uri).to_s
+        end
+      rescue URI::Error
+        # noop
+      end
+
+      def rebuild_relative_uri(uri)
+        file_path = relative_file_path(uri.path)
+
+        uri.path = [
+          relative_url_root,
+          context[:project].path_with_namespace,
+          path_type(file_path),
+          ref || context[:project].default_branch,  # if no ref exists, point to the default branch
+          file_path
+        ].compact.join('/').squeeze('/').chomp('/')
+
+        uri
+      end
+
+      def relative_file_path(path)
+        nested_path = build_relative_path(path, context[:requested_path])
+        file_exists?(nested_path) ? nested_path : path
+      end
+
+      # Convert a relative path into its correct location based on the currently
+      # requested path
+      #
+      # path         - Relative path String
+      # request_path - Currently-requested path String
+      #
+      # Examples:
+      #
+      #   # File in the same directory as the current path
+      #   build_relative_path("users.md", "doc/api/README.md")
+      #   # => "doc/api/users.md"
+      #
+      #   # File in the same directory, which is also the current path
+      #   build_relative_path("users.md", "doc/api")
+      #   # => "doc/api/users.md"
+      #
+      #   # Going up one level to a different directory
+      #   build_relative_path("../update/7.14-to-8.0.md", "doc/api/README.md")
+      #   # => "doc/update/7.14-to-8.0.md"
+      #
+      # Returns a String
+      def build_relative_path(path, request_path)
+        return request_path if path.empty?
+        return path unless request_path
+
+        parts = request_path.split('/')
+        parts.pop if path_type(request_path) != 'tree'
+
+        while parts.length > 1 && path.start_with?('../')
+          parts.pop
+          path.sub!('../', '')
+        end
+
+        parts.push(path).join('/')
+      end
+
+      def file_exists?(path)
+        return false if path.nil?
+        repository.blob_at(current_sha, path).present? ||
+          repository.tree(current_sha, path).entries.any?
+      end
+
+      # Get the type of the given path
+      #
+      # path - String path to check
+      #
+      # Examples:
+      #
+      #   path_type('doc/README.md') # => 'blob'
+      #   path_type('doc/logo.png')  # => 'raw'
+      #   path_type('doc/api')       # => 'tree'
+      #
+      # Returns a String
+      def path_type(path)
+        unescaped_path = Addressable::URI.unescape(path)
+
+        if tree?(unescaped_path)
+          'tree'
+        elsif image?(unescaped_path)
+          'raw'
+        else
+          'blob'
+        end
+      end
+
+      def tree?(path)
+        repository.tree(current_sha, path).entries.any?
+      end
+
+      def image?(path)
+        repository.blob_at(current_sha, path).try(:image?)
+      end
+
+      def current_sha
+        context[:commit].try(:id) ||
+          ref ? repository.commit(ref).try(:sha) : repository.head_commit.sha
+      end
+
+      def relative_url_root
+        Gitlab.config.gitlab.relative_url_root.presence || '/'
+      end
+
+      def ref
+        context[:ref]
+      end
+
+      def repository
+        context[:project].try(:repository)
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/filter/sanitization_filter.rb b/lib/gitlab/markdown/filter/sanitization_filter.rb
new file mode 100644
index 00000000000..cf153f30622
--- /dev/null
+++ b/lib/gitlab/markdown/filter/sanitization_filter.rb
@@ -0,0 +1,99 @@
+require 'gitlab/markdown'
+require 'html/pipeline/filter'
+require 'html/pipeline/sanitization_filter'
+
+module Gitlab
+  module Markdown
+    # Sanitize HTML
+    #
+    # Extends HTML::Pipeline::SanitizationFilter with a custom whitelist.
+    class SanitizationFilter < HTML::Pipeline::SanitizationFilter
+      def whitelist
+        # Descriptions are more heavily sanitized, allowing only a few elements.
+        # See http://git.io/vkuAN
+        if context[:inline_sanitization]
+          whitelist = LIMITED
+          whitelist[:elements] -= %w(pre code img ol ul li)
+        else
+          whitelist = super
+        end
+
+        customize_whitelist(whitelist)
+
+        whitelist
+      end
+
+      private
+
+      def customized?(transformers)
+        transformers.last.source_location[0] == __FILE__
+      end
+
+      def customize_whitelist(whitelist)
+        # Only push these customizations once
+        return if customized?(whitelist[:transformers])
+
+        # Allow code highlighting
+        whitelist[:attributes]['pre'] = %w(class)
+        whitelist[:attributes]['span'] = %w(class)
+
+        # Allow table alignment
+        whitelist[:attributes]['th'] = %w(style)
+        whitelist[:attributes]['td'] = %w(style)
+
+        # Allow span elements
+        whitelist[:elements].push('span')
+
+        # Allow any protocol in `a` elements...
+        whitelist[:protocols].delete('a')
+
+        # ...but then remove links with the `javascript` protocol
+        whitelist[:transformers].push(remove_javascript_links)
+
+        # Remove `rel` attribute from `a` elements
+        whitelist[:transformers].push(remove_rel)
+
+        # Remove `class` attribute from non-highlight spans
+        whitelist[:transformers].push(clean_spans)
+
+        whitelist
+      end
+
+      def remove_javascript_links
+        lambda do |env|
+          node = env[:node]
+
+          return unless node.name == 'a'
+          return unless node.has_attribute?('href')
+
+          if node['href'].start_with?('javascript', ':javascript')
+            node.remove_attribute('href')
+          end
+        end
+      end
+
+      def remove_rel
+        lambda do |env|
+          if env[:node_name] == 'a'
+            env[:node].remove_attribute('rel')
+          end
+        end
+      end
+
+      def clean_spans
+        lambda do |env|
+          node = env[:node]
+
+          return unless node.name == 'span'
+          return unless node.has_attribute?('class')
+
+          unless has_ancestor?(node, 'pre')
+            node.remove_attribute('class')
+          end
+
+          { node_whitelist: [node] }
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/filter/snippet_reference_filter.rb b/lib/gitlab/markdown/filter/snippet_reference_filter.rb
new file mode 100644
index 00000000000..f7bd07c2a34
--- /dev/null
+++ b/lib/gitlab/markdown/filter/snippet_reference_filter.rb
@@ -0,0 +1,25 @@
+require 'gitlab/markdown'
+
+module Gitlab
+  module Markdown
+    # HTML filter that replaces snippet references with links. References to
+    # snippets that do not exist are ignored.
+    #
+    # This filter supports cross-project references.
+    class SnippetReferenceFilter < AbstractReferenceFilter
+      def self.object_class
+        Snippet
+      end
+
+      def find_object(project, id)
+        project.snippets.find_by(id: id)
+      end
+
+      def url_for_object(snippet, project)
+        h = Gitlab::Application.routes.url_helpers
+        h.namespace_project_snippet_url(project.namespace, project, snippet,
+                                        only_path: context[:only_path])
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/filter/syntax_highlight_filter.rb b/lib/gitlab/markdown/filter/syntax_highlight_filter.rb
new file mode 100644
index 00000000000..8597e02f0de
--- /dev/null
+++ b/lib/gitlab/markdown/filter/syntax_highlight_filter.rb
@@ -0,0 +1,45 @@
+require 'gitlab/markdown'
+require 'html/pipeline/filter'
+require 'rouge/plugins/redcarpet'
+
+module Gitlab
+  module Markdown
+    # HTML Filter to highlight fenced code blocks
+    #
+    class SyntaxHighlightFilter < HTML::Pipeline::Filter
+      include Rouge::Plugins::Redcarpet
+
+      def call
+        doc.search('pre > code').each do |node|
+          highlight_node(node)
+        end
+
+        doc
+      end
+
+      def highlight_node(node)
+        language = node.attr('class')
+        code     = node.text
+
+        begin
+          highlighted = block_code(code, language)
+        rescue
+          # Gracefully handle syntax highlighter bugs/errors to ensure
+          # users can still access an issue/comment/etc.
+          highlighted = "<pre>#{code}</pre>"
+        end
+
+        # Replace the parent `pre` element with the entire highlighted block
+        node.parent.replace(highlighted)
+      end
+
+      private
+
+      # Override Rouge::Plugins::Redcarpet#rouge_formatter
+      def rouge_formatter(lexer)
+        Rouge::Formatters::HTMLGitlab.new(
+          cssclass: "code highlight js-syntax-highlight #{lexer.tag}")
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/filter/table_of_contents_filter.rb b/lib/gitlab/markdown/filter/table_of_contents_filter.rb
new file mode 100644
index 00000000000..bbb3bf7fc8b
--- /dev/null
+++ b/lib/gitlab/markdown/filter/table_of_contents_filter.rb
@@ -0,0 +1,63 @@
+require 'gitlab/markdown'
+require 'html/pipeline/filter'
+
+module Gitlab
+  module Markdown
+    # HTML filter that adds an anchor child element to all Headers in a
+    # document, so that they can be linked to.
+    #
+    # Generates the Table of Contents with links to each header. See Results.
+    #
+    # Based on HTML::Pipeline::TableOfContentsFilter.
+    #
+    # Context options:
+    #   :no_header_anchors - Skips all processing done by this filter.
+    #
+    # Results:
+    #   :toc - String containing Table of Contents data as a `ul` element with
+    #          `li` child elements.
+    class TableOfContentsFilter < HTML::Pipeline::Filter
+      PUNCTUATION_REGEXP = /[^\p{Word}\- ]/u
+
+      def call
+        return doc if context[:no_header_anchors]
+
+        result[:toc] = ""
+
+        headers = Hash.new(0)
+
+        doc.css('h1, h2, h3, h4, h5, h6').each do |node|
+          text = node.text
+
+          id = text.downcase
+          id.gsub!(PUNCTUATION_REGEXP, '') # remove punctuation
+          id.gsub!(' ', '-') # replace spaces with dash
+          id.squeeze!('-') # replace multiple dashes with one
+
+          uniq = (headers[id] > 0) ? "-#{headers[id]}" : ''
+          headers[id] += 1
+
+          if header_content = node.children.first
+            href = "#{id}#{uniq}"
+            push_toc(href, text)
+            header_content.add_previous_sibling(anchor_tag(href))
+          end
+        end
+
+        result[:toc] = %Q{<ul class="section-nav">\n#{result[:toc]}</ul>} unless result[:toc].empty?
+
+        doc
+      end
+
+      private
+
+      def anchor_tag(href)
+        %Q{<a id="#{href}" class="anchor" href="##{href}" aria-hidden="true"></a>}
+      end
+
+      def push_toc(href, text)
+        result[:toc] << %Q{<li><a href="##{href}">#{text}</a></li>\n}
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/filter/task_list_filter.rb b/lib/gitlab/markdown/filter/task_list_filter.rb
new file mode 100644
index 00000000000..2f133ae8500
--- /dev/null
+++ b/lib/gitlab/markdown/filter/task_list_filter.rb
@@ -0,0 +1,24 @@
+require 'gitlab/markdown'
+require 'task_list/filter'
+
+module Gitlab
+  module Markdown
+    # Work around a bug in the default TaskList::Filter that adds a `task-list`
+    # class to every list element, regardless of whether or not it contains a
+    # task list.
+    #
+    # This is a (hopefully) temporary fix, pending a new release of the
+    # task_list gem.
+    #
+    # See https://github.com/github/task_list/pull/60
+    class TaskListFilter < TaskList::Filter
+      def add_css_class(node, *new_class_names)
+        if new_class_names.include?('task-list')
+          super if node.children.any? { |c| c['class'] == 'task-list-item' }
+        else
+          super
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/filter/upload_link_filter.rb b/lib/gitlab/markdown/filter/upload_link_filter.rb
new file mode 100644
index 00000000000..fbada73ab86
--- /dev/null
+++ b/lib/gitlab/markdown/filter/upload_link_filter.rb
@@ -0,0 +1,47 @@
+require 'gitlab/markdown'
+require 'html/pipeline/filter'
+require 'uri'
+
+module Gitlab
+  module Markdown
+    # HTML filter that "fixes" relative upload links to files.
+    # Context options:
+    #   :project (required) - Current project
+    #
+    class UploadLinkFilter < HTML::Pipeline::Filter
+      def call
+        doc.search('a').each do |el|
+          process_link_attr el.attribute('href')
+        end
+
+        doc.search('img').each do |el|
+          process_link_attr el.attribute('src')
+        end
+
+        doc
+      end
+
+      protected
+
+      def process_link_attr(html_attr)
+        return if html_attr.blank?
+
+        uri = html_attr.value
+        if uri.starts_with?("/uploads/")
+          html_attr.value = build_url(uri).to_s
+        end
+      end
+
+      def build_url(uri)
+        File.join(Gitlab.config.gitlab.url, context[:project].path_with_namespace, uri)
+      end
+
+      # Ensure that a :project key exists in context
+      #
+      # Note that while the key might exist, its value could be nil!
+      def validate
+        needs :project
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/filter/user_reference_filter.rb b/lib/gitlab/markdown/filter/user_reference_filter.rb
new file mode 100644
index 00000000000..ab5e1f6fe9e
--- /dev/null
+++ b/lib/gitlab/markdown/filter/user_reference_filter.rb
@@ -0,0 +1,125 @@
+require 'gitlab/markdown'
+
+module Gitlab
+  module Markdown
+    # HTML filter that replaces user or group references with links.
+    #
+    # A special `@all` reference is also supported.
+    class UserReferenceFilter < ReferenceFilter
+      # Public: Find `@user` user references in text
+      #
+      #   UserReferenceFilter.references_in(text) do |match, username|
+      #     "<a href=...>@#{user}</a>"
+      #   end
+      #
+      # text - String text to search.
+      #
+      # Yields the String match, and the String user name.
+      #
+      # Returns a String replaced with the return of the block.
+      def self.references_in(text)
+        text.gsub(User.reference_pattern) do |match|
+          yield match, $~[:user]
+        end
+      end
+
+      def self.referenced_by(node)
+        if node.has_attribute?('data-group')
+          group = Group.find(node.attr('data-group')) rescue nil
+          return unless group
+
+          { user: group.users }
+        elsif node.has_attribute?('data-user')
+          { user: LazyReference.new(User, node.attr('data-user')) }
+        elsif node.has_attribute?('data-project')
+          project = Project.find(node.attr('data-project')) rescue nil
+          return unless project
+
+          { user: project.team.members.flatten }
+        end
+      end
+
+      def self.user_can_reference?(user, node, context)
+        if node.has_attribute?('data-group')
+          group = Group.find(node.attr('data-group')) rescue nil
+          Ability.abilities.allowed?(user, :read_group, group)
+        else
+          super
+        end
+      end
+
+      def call
+        replace_text_nodes_matching(User.reference_pattern) do |content|
+          user_link_filter(content)
+        end
+      end
+
+      # Replace `@user` user references in text with links to the referenced
+      # user's profile page.
+      #
+      # text - String text to replace references in.
+      #
+      # Returns a String with `@user` references replaced with links. All links
+      # have `gfm` and `gfm-project_member` class names attached for styling.
+      def user_link_filter(text)
+        self.class.references_in(text) do |match, username|
+          if username == 'all'
+            link_to_all
+          elsif namespace = Namespace.find_by(path: username)
+            link_to_namespace(namespace) || match
+          else
+            match
+          end
+        end
+      end
+
+      private
+
+      def urls
+        Gitlab::Application.routes.url_helpers
+      end
+
+      def link_class
+        reference_class(:project_member)
+      end
+
+      def link_to_all
+        project = context[:project]
+        url = urls.namespace_project_url(project.namespace, project,
+                                         only_path: context[:only_path])
+        data = data_attribute(project: project.id)
+        text = User.reference_prefix + 'all'
+
+        link_tag(url, data, text)
+      end
+
+      def link_to_namespace(namespace)
+        if namespace.is_a?(Group)
+          link_to_group(namespace.path, namespace)
+        else
+          link_to_user(namespace.path, namespace)
+        end
+      end
+
+      def link_to_group(group, namespace)
+        url = urls.group_url(group, only_path: context[:only_path])
+        data = data_attribute(group: namespace.id)
+        text = Group.reference_prefix + group
+
+        link_tag(url, data, text)
+      end
+
+      def link_to_user(user, namespace)
+        url = urls.user_url(user, only_path: context[:only_path])
+        data = data_attribute(user: namespace.owner_id)
+        text = User.reference_prefix + user
+
+        link_tag(url, data, text)
+      end
+
+      def link_tag(url, data, text)
+        %(<a href="#{url}" #{data} class="#{link_class}">#{text}</a>)
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/full_pipeline.rb b/lib/gitlab/markdown/full_pipeline.rb
deleted file mode 100644
index 553e9367c1c..00000000000
--- a/lib/gitlab/markdown/full_pipeline.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'gitlab/markdown'
-
-module Gitlab
-  module Markdown
-    class FullPipeline < CombinedPipeline.new(PlainMarkdownPipeline, GfmPipeline)
-      
-    end
-  end
-end
diff --git a/lib/gitlab/markdown/gfm_pipeline.rb b/lib/gitlab/markdown/gfm_pipeline.rb
deleted file mode 100644
index ca90bd75d77..00000000000
--- a/lib/gitlab/markdown/gfm_pipeline.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-require 'gitlab/markdown'
-
-module Gitlab
-  module Markdown
-    class GfmPipeline < Pipeline
-      def self.filters
-        @filters ||= [
-          Gitlab::Markdown::SyntaxHighlightFilter,
-          Gitlab::Markdown::SanitizationFilter,
-
-          Gitlab::Markdown::UploadLinkFilter,
-          Gitlab::Markdown::EmojiFilter,
-          Gitlab::Markdown::TableOfContentsFilter,
-          Gitlab::Markdown::AutolinkFilter,
-          Gitlab::Markdown::ExternalLinkFilter,
-
-          Gitlab::Markdown::UserReferenceFilter,
-          Gitlab::Markdown::IssueReferenceFilter,
-          Gitlab::Markdown::ExternalIssueReferenceFilter,
-          Gitlab::Markdown::MergeRequestReferenceFilter,
-          Gitlab::Markdown::SnippetReferenceFilter,
-          Gitlab::Markdown::CommitRangeReferenceFilter,
-          Gitlab::Markdown::CommitReferenceFilter,
-          Gitlab::Markdown::LabelReferenceFilter,
-
-          Gitlab::Markdown::TaskListFilter
-        ]
-      end
-
-      def self.transform_context(context)
-        context.merge(
-          only_path: true,
-
-          # EmojiFilter
-          asset_host: Gitlab::Application.config.asset_host,
-          asset_root: Gitlab.config.gitlab.base_url
-        )
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/markdown/issue_reference_filter.rb b/lib/gitlab/markdown/issue_reference_filter.rb
deleted file mode 100644
index 1ed69e2f431..00000000000
--- a/lib/gitlab/markdown/issue_reference_filter.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require 'gitlab/markdown'
-
-module Gitlab
-  module Markdown
-    # HTML filter that replaces issue references with links. References to
-    # issues that do not exist are ignored.
-    #
-    # This filter supports cross-project references.
-    class IssueReferenceFilter < AbstractReferenceFilter
-      def self.object_class
-        Issue
-      end
-
-      def find_object(project, id)
-        project.get_issue(id)
-      end
-
-      def url_for_object(issue, project)
-        IssuesHelper.url_for_issue(issue.iid, project, only_path: context[:only_path])
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/markdown/label_reference_filter.rb b/lib/gitlab/markdown/label_reference_filter.rb
deleted file mode 100644
index 618acb7a578..00000000000
--- a/lib/gitlab/markdown/label_reference_filter.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-require 'gitlab/markdown'
-
-module Gitlab
-  module Markdown
-    # HTML filter that replaces label references with links.
-    class LabelReferenceFilter < ReferenceFilter
-      # Public: Find label references in text
-      #
-      #   LabelReferenceFilter.references_in(text) do |match, id, name|
-      #     "<a href=...>#{Label.find(id)}</a>"
-      #   end
-      #
-      # text - String text to search.
-      #
-      # Yields the String match, an optional Integer label ID, and an optional
-      # String label name.
-      #
-      # Returns a String replaced with the return of the block.
-      def self.references_in(text)
-        text.gsub(Label.reference_pattern) do |match|
-          yield match, $~[:label_id].to_i, $~[:label_name]
-        end
-      end
-
-      def self.referenced_by(node)
-        { label: LazyReference.new(Label, node.attr("data-label")) }
-      end
-
-      def call
-        replace_text_nodes_matching(Label.reference_pattern) do |content|
-          label_link_filter(content)
-        end
-      end
-
-      # Replace label references in text with links to the label specified.
-      #
-      # text - String text to replace references in.
-      #
-      # Returns a String with label references replaced with links. All links
-      # have `gfm` and `gfm-label` class names attached for styling.
-      def label_link_filter(text)
-        project = context[:project]
-
-        self.class.references_in(text) do |match, id, name|
-          params = label_params(id, name)
-
-          if label = project.labels.find_by(params)
-            url = url_for_label(project, label)
-            klass = reference_class(:label)
-            data = data_attribute(project: project.id, label: label.id)
-
-            %(<a href="#{url}" #{data}
-                 class="#{klass}">#{render_colored_label(label)}</a>)
-          else
-            match
-          end
-        end
-      end
-
-      def url_for_label(project, label)
-        h = Gitlab::Application.routes.url_helpers
-        h.namespace_project_issues_path(project.namespace, project,
-                                        label_name: label.name,
-                                        only_path: context[:only_path])
-      end
-
-      def render_colored_label(label)
-        LabelsHelper.render_colored_label(label)
-      end
-
-      # Parameters to pass to `Label.find_by` based on the given arguments
-      #
-      # id   - Integer ID to pass. If present, returns {id: id}
-      # name - String name to pass. If `id` is absent, finds by name without
-      #        surrounding quotes.
-      #
-      # Returns a Hash.
-      def label_params(id, name)
-        if name
-          { name: name.tr('"', '') }
-        else
-          { id: id }
-        end
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/markdown/markdown_filter.rb b/lib/gitlab/markdown/markdown_filter.rb
deleted file mode 100644
index 921e2a0794e..00000000000
--- a/lib/gitlab/markdown/markdown_filter.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-module Gitlab
-  module Markdown
-    class MarkdownFilter < HTML::Pipeline::TextFilter
-      def initialize(text, context = nil, result = nil)
-        super text, context, result
-        @text = @text.gsub "\r", ''
-      end
-
-      def call
-        html = self.class.renderer.render(@text)
-        html.rstrip!
-        html
-      end
-  
-      private      
-
-      def self.redcarpet_options
-        # https://github.com/vmg/redcarpet#and-its-like-really-simple-to-use
-        @redcarpet_options ||= {
-          fenced_code_blocks:  true,
-          footnotes:           true,
-          lax_spacing:         true,
-          no_intra_emphasis:   true,
-          space_after_headers: true,
-          strikethrough:       true,
-          superscript:         true,
-          tables:              true
-        }.freeze
-      end
-
-      def self.renderer
-        @renderer ||= begin
-          renderer = Redcarpet::Render::HTML.new
-          Redcarpet::Markdown.new(renderer, redcarpet_options)
-        end
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/markdown/merge_request_reference_filter.rb b/lib/gitlab/markdown/merge_request_reference_filter.rb
deleted file mode 100644
index 1f47f03c94e..00000000000
--- a/lib/gitlab/markdown/merge_request_reference_filter.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'gitlab/markdown'
-
-module Gitlab
-  module Markdown
-    # HTML filter that replaces merge request references with links. References
-    # to merge requests that do not exist are ignored.
-    #
-    # This filter supports cross-project references.
-    class MergeRequestReferenceFilter < AbstractReferenceFilter
-      def self.object_class
-        MergeRequest
-      end
-
-      def find_object(project, id)
-        project.merge_requests.find_by(iid: id)
-      end
-
-      def url_for_object(mr, project)
-        h = Gitlab::Application.routes.url_helpers
-        h.namespace_project_merge_request_url(project.namespace, project, mr,
-                                            only_path: context[:only_path])
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/markdown/note_pipeline.rb b/lib/gitlab/markdown/note_pipeline.rb
deleted file mode 100644
index a8bf5f42d8e..00000000000
--- a/lib/gitlab/markdown/note_pipeline.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require 'gitlab/markdown'
-
-module Gitlab
-  module Markdown
-    class NotePipeline < FullPipeline
-      def self.transform_context(context)
-        super(context).merge( 
-          # TableOfContentsFilter
-          no_header_anchors: true
-        )
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/markdown/pipeline.rb b/lib/gitlab/markdown/pipeline.rb
index 3c0b676a073..d683756f95a 100644
--- a/lib/gitlab/markdown/pipeline.rb
+++ b/lib/gitlab/markdown/pipeline.rb
@@ -3,6 +3,11 @@ require 'gitlab/markdown'
 module Gitlab
   module Markdown
     class Pipeline
+      def self.[](name)
+        name ||= :full
+        Markdown.const_get("#{name.to_s.camelize}Pipeline")
+      end
+
       def self.filters
         []
       end
diff --git a/lib/gitlab/markdown/pipeline/asciidoc_pipeline.rb b/lib/gitlab/markdown/pipeline/asciidoc_pipeline.rb
new file mode 100644
index 00000000000..6829b4acb95
--- /dev/null
+++ b/lib/gitlab/markdown/pipeline/asciidoc_pipeline.rb
@@ -0,0 +1,13 @@
+require 'gitlab/markdown'
+
+module Gitlab
+  module Markdown
+    class AsciidocPipeline < Pipeline
+      def self.filters
+        [
+          Gitlab::Markdown::RelativeLinkFilter
+        ]
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/pipeline/atom_pipeline.rb b/lib/gitlab/markdown/pipeline/atom_pipeline.rb
new file mode 100644
index 00000000000..e151f8f5e5a
--- /dev/null
+++ b/lib/gitlab/markdown/pipeline/atom_pipeline.rb
@@ -0,0 +1,14 @@
+require 'gitlab/markdown'
+
+module Gitlab
+  module Markdown
+    class AtomPipeline < FullPipeline
+      def self.transform_context(context)
+        super(context).merge( 
+          only_path: false, 
+          xhtml: true 
+        )
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/pipeline/description_pipeline.rb b/lib/gitlab/markdown/pipeline/description_pipeline.rb
new file mode 100644
index 00000000000..76f6948af8f
--- /dev/null
+++ b/lib/gitlab/markdown/pipeline/description_pipeline.rb
@@ -0,0 +1,14 @@
+require 'gitlab/markdown'
+
+module Gitlab
+  module Markdown
+    class DescriptionPipeline < FullPipeline
+      def self.transform_context(context)
+        super(context).merge( 
+          # SanitizationFilter
+          inline_sanitization: true
+        )
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/pipeline/email_pipeline.rb b/lib/gitlab/markdown/pipeline/email_pipeline.rb
new file mode 100644
index 00000000000..b88cb790270
--- /dev/null
+++ b/lib/gitlab/markdown/pipeline/email_pipeline.rb
@@ -0,0 +1,13 @@
+require 'gitlab/markdown'
+
+module Gitlab
+  module Markdown
+    class EmailPipeline < FullPipeline
+      def self.transform_context(context)
+        super(context).merge( 
+          only_path: false
+        )
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/pipeline/full_pipeline.rb b/lib/gitlab/markdown/pipeline/full_pipeline.rb
new file mode 100644
index 00000000000..553e9367c1c
--- /dev/null
+++ b/lib/gitlab/markdown/pipeline/full_pipeline.rb
@@ -0,0 +1,9 @@
+require 'gitlab/markdown'
+
+module Gitlab
+  module Markdown
+    class FullPipeline < CombinedPipeline.new(PlainMarkdownPipeline, GfmPipeline)
+      
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/pipeline/gfm_pipeline.rb b/lib/gitlab/markdown/pipeline/gfm_pipeline.rb
new file mode 100644
index 00000000000..ca90bd75d77
--- /dev/null
+++ b/lib/gitlab/markdown/pipeline/gfm_pipeline.rb
@@ -0,0 +1,41 @@
+require 'gitlab/markdown'
+
+module Gitlab
+  module Markdown
+    class GfmPipeline < Pipeline
+      def self.filters
+        @filters ||= [
+          Gitlab::Markdown::SyntaxHighlightFilter,
+          Gitlab::Markdown::SanitizationFilter,
+
+          Gitlab::Markdown::UploadLinkFilter,
+          Gitlab::Markdown::EmojiFilter,
+          Gitlab::Markdown::TableOfContentsFilter,
+          Gitlab::Markdown::AutolinkFilter,
+          Gitlab::Markdown::ExternalLinkFilter,
+
+          Gitlab::Markdown::UserReferenceFilter,
+          Gitlab::Markdown::IssueReferenceFilter,
+          Gitlab::Markdown::ExternalIssueReferenceFilter,
+          Gitlab::Markdown::MergeRequestReferenceFilter,
+          Gitlab::Markdown::SnippetReferenceFilter,
+          Gitlab::Markdown::CommitRangeReferenceFilter,
+          Gitlab::Markdown::CommitReferenceFilter,
+          Gitlab::Markdown::LabelReferenceFilter,
+
+          Gitlab::Markdown::TaskListFilter
+        ]
+      end
+
+      def self.transform_context(context)
+        context.merge(
+          only_path: true,
+
+          # EmojiFilter
+          asset_host: Gitlab::Application.config.asset_host,
+          asset_root: Gitlab.config.gitlab.base_url
+        )
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/pipeline/note_pipeline.rb b/lib/gitlab/markdown/pipeline/note_pipeline.rb
new file mode 100644
index 00000000000..a8bf5f42d8e
--- /dev/null
+++ b/lib/gitlab/markdown/pipeline/note_pipeline.rb
@@ -0,0 +1,14 @@
+require 'gitlab/markdown'
+
+module Gitlab
+  module Markdown
+    class NotePipeline < FullPipeline
+      def self.transform_context(context)
+        super(context).merge( 
+          # TableOfContentsFilter
+          no_header_anchors: true
+        )
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/pipeline/plain_markdown_pipeline.rb b/lib/gitlab/markdown/pipeline/plain_markdown_pipeline.rb
new file mode 100644
index 00000000000..0abb93f8a03
--- /dev/null
+++ b/lib/gitlab/markdown/pipeline/plain_markdown_pipeline.rb
@@ -0,0 +1,13 @@
+require 'gitlab/markdown'
+
+module Gitlab
+  module Markdown
+    class PlainMarkdownPipeline < Pipeline
+      def self.filters
+        [
+          Gitlab::Markdown::MarkdownFilter
+        ]
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/pipeline/post_process_pipeline.rb b/lib/gitlab/markdown/pipeline/post_process_pipeline.rb
new file mode 100644
index 00000000000..60cc32f490e
--- /dev/null
+++ b/lib/gitlab/markdown/pipeline/post_process_pipeline.rb
@@ -0,0 +1,20 @@
+require 'gitlab/markdown'
+
+module Gitlab
+  module Markdown
+    class PostProcessPipeline < Pipeline
+      def self.filters
+        [
+          Gitlab::Markdown::RelativeLinkFilter, 
+          Gitlab::Markdown::RedactorFilter
+        ]
+      end
+
+      def self.transform_context(context)
+        context.merge(
+          post_process: true
+        )
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/pipeline/reference_extraction_pipeline.rb b/lib/gitlab/markdown/pipeline/reference_extraction_pipeline.rb
new file mode 100644
index 00000000000..a89ab462bac
--- /dev/null
+++ b/lib/gitlab/markdown/pipeline/reference_extraction_pipeline.rb
@@ -0,0 +1,13 @@
+require 'gitlab/markdown'
+
+module Gitlab
+  module Markdown
+    class ReferenceExtractionPipeline < Pipeline
+      def self.filters
+        [
+          Gitlab::Markdown::ReferenceGathererFilter
+        ]
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/pipeline/single_line_pipeline.rb b/lib/gitlab/markdown/pipeline/single_line_pipeline.rb
new file mode 100644
index 00000000000..2f24927b879
--- /dev/null
+++ b/lib/gitlab/markdown/pipeline/single_line_pipeline.rb
@@ -0,0 +1,9 @@
+require 'gitlab/markdown'
+
+module Gitlab
+  module Markdown
+    class SingleLinePipeline < GfmPipeline
+      
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/plain_markdown_pipeline.rb b/lib/gitlab/markdown/plain_markdown_pipeline.rb
deleted file mode 100644
index 0abb93f8a03..00000000000
--- a/lib/gitlab/markdown/plain_markdown_pipeline.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'gitlab/markdown'
-
-module Gitlab
-  module Markdown
-    class PlainMarkdownPipeline < Pipeline
-      def self.filters
-        [
-          Gitlab::Markdown::MarkdownFilter
-        ]
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/markdown/post_process_pipeline.rb b/lib/gitlab/markdown/post_process_pipeline.rb
deleted file mode 100644
index 60cc32f490e..00000000000
--- a/lib/gitlab/markdown/post_process_pipeline.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require 'gitlab/markdown'
-
-module Gitlab
-  module Markdown
-    class PostProcessPipeline < Pipeline
-      def self.filters
-        [
-          Gitlab::Markdown::RelativeLinkFilter, 
-          Gitlab::Markdown::RedactorFilter
-        ]
-      end
-
-      def self.transform_context(context)
-        context.merge(
-          post_process: true
-        )
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/markdown/redactor_filter.rb b/lib/gitlab/markdown/redactor_filter.rb
deleted file mode 100644
index a1f3a8a8ebf..00000000000
--- a/lib/gitlab/markdown/redactor_filter.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-require 'gitlab/markdown'
-require 'html/pipeline/filter'
-
-module Gitlab
-  module Markdown
-    # HTML filter that removes references to records that the current user does
-    # not have permission to view.
-    #
-    # Expected to be run in its own post-processing pipeline.
-    #
-    class RedactorFilter < HTML::Pipeline::Filter
-      def call
-        doc.css('a.gfm').each do |node|
-          unless user_can_reference?(node)
-            node.replace(node.text)
-          end
-        end
-
-        doc
-      end
-
-      private
-
-      def user_can_reference?(node)
-        if node.has_attribute?('data-reference-filter')
-          reference_type = node.attr('data-reference-filter')
-          reference_filter = reference_type.constantize
-
-          reference_filter.user_can_reference?(current_user, node, context)
-        else
-          true
-        end
-      end
-
-      def current_user
-        context[:current_user]
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/markdown/reference_extraction_pipeline.rb b/lib/gitlab/markdown/reference_extraction_pipeline.rb
deleted file mode 100644
index a89ab462bac..00000000000
--- a/lib/gitlab/markdown/reference_extraction_pipeline.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'gitlab/markdown'
-
-module Gitlab
-  module Markdown
-    class ReferenceExtractionPipeline < Pipeline
-      def self.filters
-        [
-          Gitlab::Markdown::ReferenceGathererFilter
-        ]
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/markdown/reference_filter.rb b/lib/gitlab/markdown/reference_filter.rb
index a4c560f578c..22fe4440be3 100644
--- a/lib/gitlab/markdown/reference_filter.rb
+++ b/lib/gitlab/markdown/reference_filter.rb
@@ -29,6 +29,10 @@ module Gitlab
         end
       end
 
+      def self.[](name)
+        Markdown.const_get("#{name.to_s.camelize}ReferenceFilter")
+      end
+
       def self.user_can_reference?(user, node, context)
         if node.has_attribute?('data-project')
           project_id = node.attr('data-project').to_i
diff --git a/lib/gitlab/markdown/reference_gatherer_filter.rb b/lib/gitlab/markdown/reference_gatherer_filter.rb
deleted file mode 100644
index 00f983675e6..00000000000
--- a/lib/gitlab/markdown/reference_gatherer_filter.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-require 'gitlab/markdown'
-require 'html/pipeline/filter'
-
-module Gitlab
-  module Markdown
-    # HTML filter that gathers all referenced records that the current user has
-    # permission to view.
-    #
-    # Expected to be run in its own post-processing pipeline.
-    #
-    class ReferenceGathererFilter < HTML::Pipeline::Filter
-      def initialize(*)
-        super
-
-        result[:references] ||= Hash.new { |hash, type| hash[type] = [] }
-      end
-
-      def call
-        doc.css('a.gfm').each do |node|
-          gather_references(node)
-        end
-
-        load_lazy_references unless context[:load_lazy_references] == false
-
-        doc
-      end
-
-      private
-
-      def gather_references(node)
-        return unless node.has_attribute?('data-reference-filter')
-
-        reference_type = node.attr('data-reference-filter')
-        reference_filter = reference_type.constantize
-
-        return if context[:reference_filter] && reference_filter != context[:reference_filter]
-
-        return unless reference_filter.user_can_reference?(current_user, node, context)
-
-        references = reference_filter.referenced_by(node)
-        return unless references
-
-        references.each do |type, values|
-          Array.wrap(values).each do |value|
-            result[:references][type] << value
-          end
-        end
-      end
-
-      # Will load all references of one type using one query.
-      def load_lazy_references
-        refs = result[:references]
-        refs.each do |type, values|
-          refs[type] = ReferenceFilter::LazyReference.load(values)
-        end
-      end
-
-      def current_user
-        context[:current_user]
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/markdown/relative_link_filter.rb b/lib/gitlab/markdown/relative_link_filter.rb
deleted file mode 100644
index 81f60120fcd..00000000000
--- a/lib/gitlab/markdown/relative_link_filter.rb
+++ /dev/null
@@ -1,157 +0,0 @@
-require 'gitlab/markdown'
-require 'html/pipeline/filter'
-require 'uri'
-
-module Gitlab
-  module Markdown
-    # HTML filter that "fixes" relative links to files in a repository.
-    #
-    # Context options:
-    #   :commit
-    #   :project
-    #   :project_wiki
-    #   :ref
-    #   :requested_path
-    class RelativeLinkFilter < HTML::Pipeline::Filter
-      def call
-        return doc unless linkable_files?
-
-        doc.search('a:not(.gfm)').each do |el|
-          process_link_attr el.attribute('href')
-        end
-
-        doc.search('img').each do |el|
-          process_link_attr el.attribute('src')
-        end
-
-        doc
-      end
-
-      protected
-
-      def linkable_files?
-        context[:project_wiki].nil? && repository.try(:exists?) && !repository.empty?
-      end
-
-      def process_link_attr(html_attr)
-        return if html_attr.blank?
-
-        uri = URI(html_attr.value)
-        if uri.relative? && uri.path.present?
-          html_attr.value = rebuild_relative_uri(uri).to_s
-        end
-      rescue URI::Error
-        # noop
-      end
-
-      def rebuild_relative_uri(uri)
-        file_path = relative_file_path(uri.path)
-
-        uri.path = [
-          relative_url_root,
-          context[:project].path_with_namespace,
-          path_type(file_path),
-          ref || context[:project].default_branch,  # if no ref exists, point to the default branch
-          file_path
-        ].compact.join('/').squeeze('/').chomp('/')
-
-        uri
-      end
-
-      def relative_file_path(path)
-        nested_path = build_relative_path(path, context[:requested_path])
-        file_exists?(nested_path) ? nested_path : path
-      end
-
-      # Convert a relative path into its correct location based on the currently
-      # requested path
-      #
-      # path         - Relative path String
-      # request_path - Currently-requested path String
-      #
-      # Examples:
-      #
-      #   # File in the same directory as the current path
-      #   build_relative_path("users.md", "doc/api/README.md")
-      #   # => "doc/api/users.md"
-      #
-      #   # File in the same directory, which is also the current path
-      #   build_relative_path("users.md", "doc/api")
-      #   # => "doc/api/users.md"
-      #
-      #   # Going up one level to a different directory
-      #   build_relative_path("../update/7.14-to-8.0.md", "doc/api/README.md")
-      #   # => "doc/update/7.14-to-8.0.md"
-      #
-      # Returns a String
-      def build_relative_path(path, request_path)
-        return request_path if path.empty?
-        return path unless request_path
-
-        parts = request_path.split('/')
-        parts.pop if path_type(request_path) != 'tree'
-
-        while parts.length > 1 && path.start_with?('../')
-          parts.pop
-          path.sub!('../', '')
-        end
-
-        parts.push(path).join('/')
-      end
-
-      def file_exists?(path)
-        return false if path.nil?
-        repository.blob_at(current_sha, path).present? ||
-          repository.tree(current_sha, path).entries.any?
-      end
-
-      # Get the type of the given path
-      #
-      # path - String path to check
-      #
-      # Examples:
-      #
-      #   path_type('doc/README.md') # => 'blob'
-      #   path_type('doc/logo.png')  # => 'raw'
-      #   path_type('doc/api')       # => 'tree'
-      #
-      # Returns a String
-      def path_type(path)
-        unescaped_path = Addressable::URI.unescape(path)
-
-        if tree?(unescaped_path)
-          'tree'
-        elsif image?(unescaped_path)
-          'raw'
-        else
-          'blob'
-        end
-      end
-
-      def tree?(path)
-        repository.tree(current_sha, path).entries.any?
-      end
-
-      def image?(path)
-        repository.blob_at(current_sha, path).try(:image?)
-      end
-
-      def current_sha
-        context[:commit].try(:id) ||
-          ref ? repository.commit(ref).try(:sha) : repository.head_commit.sha
-      end
-
-      def relative_url_root
-        Gitlab.config.gitlab.relative_url_root.presence || '/'
-      end
-
-      def ref
-        context[:ref]
-      end
-
-      def repository
-        context[:project].try(:repository)
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/markdown/sanitization_filter.rb b/lib/gitlab/markdown/sanitization_filter.rb
deleted file mode 100644
index cf153f30622..00000000000
--- a/lib/gitlab/markdown/sanitization_filter.rb
+++ /dev/null
@@ -1,99 +0,0 @@
-require 'gitlab/markdown'
-require 'html/pipeline/filter'
-require 'html/pipeline/sanitization_filter'
-
-module Gitlab
-  module Markdown
-    # Sanitize HTML
-    #
-    # Extends HTML::Pipeline::SanitizationFilter with a custom whitelist.
-    class SanitizationFilter < HTML::Pipeline::SanitizationFilter
-      def whitelist
-        # Descriptions are more heavily sanitized, allowing only a few elements.
-        # See http://git.io/vkuAN
-        if context[:inline_sanitization]
-          whitelist = LIMITED
-          whitelist[:elements] -= %w(pre code img ol ul li)
-        else
-          whitelist = super
-        end
-
-        customize_whitelist(whitelist)
-
-        whitelist
-      end
-
-      private
-
-      def customized?(transformers)
-        transformers.last.source_location[0] == __FILE__
-      end
-
-      def customize_whitelist(whitelist)
-        # Only push these customizations once
-        return if customized?(whitelist[:transformers])
-
-        # Allow code highlighting
-        whitelist[:attributes]['pre'] = %w(class)
-        whitelist[:attributes]['span'] = %w(class)
-
-        # Allow table alignment
-        whitelist[:attributes]['th'] = %w(style)
-        whitelist[:attributes]['td'] = %w(style)
-
-        # Allow span elements
-        whitelist[:elements].push('span')
-
-        # Allow any protocol in `a` elements...
-        whitelist[:protocols].delete('a')
-
-        # ...but then remove links with the `javascript` protocol
-        whitelist[:transformers].push(remove_javascript_links)
-
-        # Remove `rel` attribute from `a` elements
-        whitelist[:transformers].push(remove_rel)
-
-        # Remove `class` attribute from non-highlight spans
-        whitelist[:transformers].push(clean_spans)
-
-        whitelist
-      end
-
-      def remove_javascript_links
-        lambda do |env|
-          node = env[:node]
-
-          return unless node.name == 'a'
-          return unless node.has_attribute?('href')
-
-          if node['href'].start_with?('javascript', ':javascript')
-            node.remove_attribute('href')
-          end
-        end
-      end
-
-      def remove_rel
-        lambda do |env|
-          if env[:node_name] == 'a'
-            env[:node].remove_attribute('rel')
-          end
-        end
-      end
-
-      def clean_spans
-        lambda do |env|
-          node = env[:node]
-
-          return unless node.name == 'span'
-          return unless node.has_attribute?('class')
-
-          unless has_ancestor?(node, 'pre')
-            node.remove_attribute('class')
-          end
-
-          { node_whitelist: [node] }
-        end
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/markdown/single_line_pipeline.rb b/lib/gitlab/markdown/single_line_pipeline.rb
deleted file mode 100644
index 2f24927b879..00000000000
--- a/lib/gitlab/markdown/single_line_pipeline.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'gitlab/markdown'
-
-module Gitlab
-  module Markdown
-    class SingleLinePipeline < GfmPipeline
-      
-    end
-  end
-end
diff --git a/lib/gitlab/markdown/snippet_reference_filter.rb b/lib/gitlab/markdown/snippet_reference_filter.rb
deleted file mode 100644
index f7bd07c2a34..00000000000
--- a/lib/gitlab/markdown/snippet_reference_filter.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'gitlab/markdown'
-
-module Gitlab
-  module Markdown
-    # HTML filter that replaces snippet references with links. References to
-    # snippets that do not exist are ignored.
-    #
-    # This filter supports cross-project references.
-    class SnippetReferenceFilter < AbstractReferenceFilter
-      def self.object_class
-        Snippet
-      end
-
-      def find_object(project, id)
-        project.snippets.find_by(id: id)
-      end
-
-      def url_for_object(snippet, project)
-        h = Gitlab::Application.routes.url_helpers
-        h.namespace_project_snippet_url(project.namespace, project, snippet,
-                                        only_path: context[:only_path])
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/markdown/syntax_highlight_filter.rb b/lib/gitlab/markdown/syntax_highlight_filter.rb
deleted file mode 100644
index 8597e02f0de..00000000000
--- a/lib/gitlab/markdown/syntax_highlight_filter.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-require 'gitlab/markdown'
-require 'html/pipeline/filter'
-require 'rouge/plugins/redcarpet'
-
-module Gitlab
-  module Markdown
-    # HTML Filter to highlight fenced code blocks
-    #
-    class SyntaxHighlightFilter < HTML::Pipeline::Filter
-      include Rouge::Plugins::Redcarpet
-
-      def call
-        doc.search('pre > code').each do |node|
-          highlight_node(node)
-        end
-
-        doc
-      end
-
-      def highlight_node(node)
-        language = node.attr('class')
-        code     = node.text
-
-        begin
-          highlighted = block_code(code, language)
-        rescue
-          # Gracefully handle syntax highlighter bugs/errors to ensure
-          # users can still access an issue/comment/etc.
-          highlighted = "<pre>#{code}</pre>"
-        end
-
-        # Replace the parent `pre` element with the entire highlighted block
-        node.parent.replace(highlighted)
-      end
-
-      private
-
-      # Override Rouge::Plugins::Redcarpet#rouge_formatter
-      def rouge_formatter(lexer)
-        Rouge::Formatters::HTMLGitlab.new(
-          cssclass: "code highlight js-syntax-highlight #{lexer.tag}")
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/markdown/table_of_contents_filter.rb b/lib/gitlab/markdown/table_of_contents_filter.rb
deleted file mode 100644
index bbb3bf7fc8b..00000000000
--- a/lib/gitlab/markdown/table_of_contents_filter.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-require 'gitlab/markdown'
-require 'html/pipeline/filter'
-
-module Gitlab
-  module Markdown
-    # HTML filter that adds an anchor child element to all Headers in a
-    # document, so that they can be linked to.
-    #
-    # Generates the Table of Contents with links to each header. See Results.
-    #
-    # Based on HTML::Pipeline::TableOfContentsFilter.
-    #
-    # Context options:
-    #   :no_header_anchors - Skips all processing done by this filter.
-    #
-    # Results:
-    #   :toc - String containing Table of Contents data as a `ul` element with
-    #          `li` child elements.
-    class TableOfContentsFilter < HTML::Pipeline::Filter
-      PUNCTUATION_REGEXP = /[^\p{Word}\- ]/u
-
-      def call
-        return doc if context[:no_header_anchors]
-
-        result[:toc] = ""
-
-        headers = Hash.new(0)
-
-        doc.css('h1, h2, h3, h4, h5, h6').each do |node|
-          text = node.text
-
-          id = text.downcase
-          id.gsub!(PUNCTUATION_REGEXP, '') # remove punctuation
-          id.gsub!(' ', '-') # replace spaces with dash
-          id.squeeze!('-') # replace multiple dashes with one
-
-          uniq = (headers[id] > 0) ? "-#{headers[id]}" : ''
-          headers[id] += 1
-
-          if header_content = node.children.first
-            href = "#{id}#{uniq}"
-            push_toc(href, text)
-            header_content.add_previous_sibling(anchor_tag(href))
-          end
-        end
-
-        result[:toc] = %Q{<ul class="section-nav">\n#{result[:toc]}</ul>} unless result[:toc].empty?
-
-        doc
-      end
-
-      private
-
-      def anchor_tag(href)
-        %Q{<a id="#{href}" class="anchor" href="##{href}" aria-hidden="true"></a>}
-      end
-
-      def push_toc(href, text)
-        result[:toc] << %Q{<li><a href="##{href}">#{text}</a></li>\n}
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/markdown/task_list_filter.rb b/lib/gitlab/markdown/task_list_filter.rb
deleted file mode 100644
index 2f133ae8500..00000000000
--- a/lib/gitlab/markdown/task_list_filter.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require 'gitlab/markdown'
-require 'task_list/filter'
-
-module Gitlab
-  module Markdown
-    # Work around a bug in the default TaskList::Filter that adds a `task-list`
-    # class to every list element, regardless of whether or not it contains a
-    # task list.
-    #
-    # This is a (hopefully) temporary fix, pending a new release of the
-    # task_list gem.
-    #
-    # See https://github.com/github/task_list/pull/60
-    class TaskListFilter < TaskList::Filter
-      def add_css_class(node, *new_class_names)
-        if new_class_names.include?('task-list')
-          super if node.children.any? { |c| c['class'] == 'task-list-item' }
-        else
-          super
-        end
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/markdown/upload_link_filter.rb b/lib/gitlab/markdown/upload_link_filter.rb
deleted file mode 100644
index fbada73ab86..00000000000
--- a/lib/gitlab/markdown/upload_link_filter.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-require 'gitlab/markdown'
-require 'html/pipeline/filter'
-require 'uri'
-
-module Gitlab
-  module Markdown
-    # HTML filter that "fixes" relative upload links to files.
-    # Context options:
-    #   :project (required) - Current project
-    #
-    class UploadLinkFilter < HTML::Pipeline::Filter
-      def call
-        doc.search('a').each do |el|
-          process_link_attr el.attribute('href')
-        end
-
-        doc.search('img').each do |el|
-          process_link_attr el.attribute('src')
-        end
-
-        doc
-      end
-
-      protected
-
-      def process_link_attr(html_attr)
-        return if html_attr.blank?
-
-        uri = html_attr.value
-        if uri.starts_with?("/uploads/")
-          html_attr.value = build_url(uri).to_s
-        end
-      end
-
-      def build_url(uri)
-        File.join(Gitlab.config.gitlab.url, context[:project].path_with_namespace, uri)
-      end
-
-      # Ensure that a :project key exists in context
-      #
-      # Note that while the key might exist, its value could be nil!
-      def validate
-        needs :project
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/markdown/user_reference_filter.rb b/lib/gitlab/markdown/user_reference_filter.rb
deleted file mode 100644
index ab5e1f6fe9e..00000000000
--- a/lib/gitlab/markdown/user_reference_filter.rb
+++ /dev/null
@@ -1,125 +0,0 @@
-require 'gitlab/markdown'
-
-module Gitlab
-  module Markdown
-    # HTML filter that replaces user or group references with links.
-    #
-    # A special `@all` reference is also supported.
-    class UserReferenceFilter < ReferenceFilter
-      # Public: Find `@user` user references in text
-      #
-      #   UserReferenceFilter.references_in(text) do |match, username|
-      #     "<a href=...>@#{user}</a>"
-      #   end
-      #
-      # text - String text to search.
-      #
-      # Yields the String match, and the String user name.
-      #
-      # Returns a String replaced with the return of the block.
-      def self.references_in(text)
-        text.gsub(User.reference_pattern) do |match|
-          yield match, $~[:user]
-        end
-      end
-
-      def self.referenced_by(node)
-        if node.has_attribute?('data-group')
-          group = Group.find(node.attr('data-group')) rescue nil
-          return unless group
-
-          { user: group.users }
-        elsif node.has_attribute?('data-user')
-          { user: LazyReference.new(User, node.attr('data-user')) }
-        elsif node.has_attribute?('data-project')
-          project = Project.find(node.attr('data-project')) rescue nil
-          return unless project
-
-          { user: project.team.members.flatten }
-        end
-      end
-
-      def self.user_can_reference?(user, node, context)
-        if node.has_attribute?('data-group')
-          group = Group.find(node.attr('data-group')) rescue nil
-          Ability.abilities.allowed?(user, :read_group, group)
-        else
-          super
-        end
-      end
-
-      def call
-        replace_text_nodes_matching(User.reference_pattern) do |content|
-          user_link_filter(content)
-        end
-      end
-
-      # Replace `@user` user references in text with links to the referenced
-      # user's profile page.
-      #
-      # text - String text to replace references in.
-      #
-      # Returns a String with `@user` references replaced with links. All links
-      # have `gfm` and `gfm-project_member` class names attached for styling.
-      def user_link_filter(text)
-        self.class.references_in(text) do |match, username|
-          if username == 'all'
-            link_to_all
-          elsif namespace = Namespace.find_by(path: username)
-            link_to_namespace(namespace) || match
-          else
-            match
-          end
-        end
-      end
-
-      private
-
-      def urls
-        Gitlab::Application.routes.url_helpers
-      end
-
-      def link_class
-        reference_class(:project_member)
-      end
-
-      def link_to_all
-        project = context[:project]
-        url = urls.namespace_project_url(project.namespace, project,
-                                         only_path: context[:only_path])
-        data = data_attribute(project: project.id)
-        text = User.reference_prefix + 'all'
-
-        link_tag(url, data, text)
-      end
-
-      def link_to_namespace(namespace)
-        if namespace.is_a?(Group)
-          link_to_group(namespace.path, namespace)
-        else
-          link_to_user(namespace.path, namespace)
-        end
-      end
-
-      def link_to_group(group, namespace)
-        url = urls.group_url(group, only_path: context[:only_path])
-        data = data_attribute(group: namespace.id)
-        text = Group.reference_prefix + group
-
-        link_tag(url, data, text)
-      end
-
-      def link_to_user(user, namespace)
-        url = urls.user_url(user, only_path: context[:only_path])
-        data = data_attribute(user: namespace.owner_id)
-        text = User.reference_prefix + user
-
-        link_tag(url, data, text)
-      end
-
-      def link_tag(url, data, text)
-        %(<a href="#{url}" #{data} class="#{link_class}">#{text}</a>)
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/reference_extractor.rb b/lib/gitlab/reference_extractor.rb
index e5cafebdbc0..e83167fa7d7 100644
--- a/lib/gitlab/reference_extractor.rb
+++ b/lib/gitlab/reference_extractor.rb
@@ -33,8 +33,7 @@ module Gitlab
     #
     # Returns the results Array for the requested filter type
     def pipeline_result(filter_type)
-      klass  = "#{filter_type.to_s.camelize}ReferenceFilter"
-      filter = Gitlab::Markdown.const_get(klass)
+      filter = Gitlab::Markdown::ReferenceFilter[filter_type]
 
       context = {
         pipeline: :reference_extraction,
diff --git a/spec/lib/gitlab/markdown/autolink_filter_spec.rb b/spec/lib/gitlab/markdown/autolink_filter_spec.rb
deleted file mode 100644
index 26332ba5217..00000000000
--- a/spec/lib/gitlab/markdown/autolink_filter_spec.rb
+++ /dev/null
@@ -1,114 +0,0 @@
-require 'spec_helper'
-
-module Gitlab::Markdown
-  describe AutolinkFilter do
-    include FilterSpecHelper
-
-    let(:link) { 'http://about.gitlab.com/' }
-
-    it 'does nothing when :autolink is false' do
-      exp = act = link
-      expect(filter(act, autolink: false).to_html).to eq exp
-    end
-
-    it 'does nothing with non-link text' do
-      exp = act = 'This text contains no links to autolink'
-      expect(filter(act).to_html).to eq exp
-    end
-
-    context 'Rinku schemes' do
-      it 'autolinks http' do
-        doc = filter("See #{link}")
-        expect(doc.at_css('a').text).to eq link
-        expect(doc.at_css('a')['href']).to eq link
-      end
-
-      it 'autolinks https' do
-        link = 'https://google.com/'
-        doc = filter("See #{link}")
-
-        expect(doc.at_css('a').text).to eq link
-        expect(doc.at_css('a')['href']).to eq link
-      end
-
-      it 'autolinks ftp' do
-        link = 'ftp://ftp.us.debian.org/debian/'
-        doc = filter("See #{link}")
-
-        expect(doc.at_css('a').text).to eq link
-        expect(doc.at_css('a')['href']).to eq link
-      end
-
-      it 'autolinks short URLs' do
-        link = 'http://localhost:3000/'
-        doc = filter("See #{link}")
-
-        expect(doc.at_css('a').text).to eq link
-        expect(doc.at_css('a')['href']).to eq link
-      end
-
-      it 'accepts link_attr options' do
-        doc = filter("See #{link}", link_attr: { class: 'custom' })
-
-        expect(doc.at_css('a')['class']).to eq 'custom'
-      end
-
-      described_class::IGNORE_PARENTS.each do |elem|
-        it "ignores valid links contained inside '#{elem}' element" do
-          exp = act = "<#{elem}>See #{link}</#{elem}>"
-          expect(filter(act).to_html).to eq exp
-        end
-      end
-    end
-
-    context 'other schemes' do
-      let(:link) { 'foo://bar.baz/' }
-
-      it 'autolinks smb' do
-        link = 'smb:///Volumes/shared/foo.pdf'
-        doc = filter("See #{link}")
-
-        expect(doc.at_css('a').text).to eq link
-        expect(doc.at_css('a')['href']).to eq link
-      end
-
-      it 'autolinks irc' do
-        link = 'irc://irc.freenode.net/git'
-        doc = filter("See #{link}")
-
-        expect(doc.at_css('a').text).to eq link
-        expect(doc.at_css('a')['href']).to eq link
-      end
-
-      it 'does not include trailing punctuation' do
-        doc = filter("See #{link}.")
-        expect(doc.at_css('a').text).to eq link
-
-        doc = filter("See #{link}, ok?")
-        expect(doc.at_css('a').text).to eq link
-
-        doc = filter("See #{link}...")
-        expect(doc.at_css('a').text).to eq link
-      end
-
-      it 'does not include trailing HTML entities' do
-        doc = filter("See &lt;&lt;&lt;#{link}&gt;&gt;&gt;")
-
-        expect(doc.at_css('a')['href']).to eq link
-        expect(doc.text).to eq "See <<<#{link}>>>"
-      end
-
-      it 'accepts link_attr options' do
-        doc = filter("See #{link}", link_attr: { class: 'custom' })
-        expect(doc.at_css('a')['class']).to eq 'custom'
-      end
-
-      described_class::IGNORE_PARENTS.each do |elem|
-        it "ignores valid links contained inside '#{elem}' element" do
-          exp = act = "<#{elem}>See #{link}</#{elem}>"
-          expect(filter(act).to_html).to eq exp
-        end
-      end
-    end
-  end
-end
diff --git a/spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb b/spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
deleted file mode 100644
index e5b8d723fe5..00000000000
--- a/spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
+++ /dev/null
@@ -1,145 +0,0 @@
-require 'spec_helper'
-
-module Gitlab::Markdown
-  describe CommitRangeReferenceFilter do
-    include FilterSpecHelper
-
-    let(:project) { create(:project, :public) }
-    let(:commit1) { project.commit }
-    let(:commit2) { project.commit("HEAD~2") }
-
-    let(:range)  { CommitRange.new("#{commit1.id}...#{commit2.id}") }
-    let(:range2) { CommitRange.new("#{commit1.id}..#{commit2.id}") }
-
-    it 'requires project context' do
-      expect { described_class.call('') }.to raise_error(ArgumentError, /:project/)
-    end
-
-    %w(pre code a style).each do |elem|
-      it "ignores valid references contained inside '#{elem}' element" do
-        exp = act = "<#{elem}>Commit Range #{range.to_reference}</#{elem}>"
-        expect(filter(act).to_html).to eq exp
-      end
-    end
-
-    context 'internal reference' do
-      let(:reference)  { range.to_reference }
-      let(:reference2) { range2.to_reference }
-
-      it 'links to a valid two-dot reference' do
-        doc = filter("See #{reference2}")
-
-        expect(doc.css('a').first.attr('href')).
-          to eq urls.namespace_project_compare_url(project.namespace, project, range2.to_param)
-      end
-
-      it 'links to a valid three-dot reference' do
-        doc = filter("See #{reference}")
-
-        expect(doc.css('a').first.attr('href')).
-          to eq urls.namespace_project_compare_url(project.namespace, project, range.to_param)
-      end
-
-      it 'links to a valid short ID' do
-        reference = "#{commit1.short_id}...#{commit2.id}"
-        reference2 = "#{commit1.id}...#{commit2.short_id}"
-
-        exp = commit1.short_id + '...' + commit2.short_id
-
-        expect(filter("See #{reference}").css('a').first.text).to eq exp
-        expect(filter("See #{reference2}").css('a').first.text).to eq exp
-      end
-
-      it 'links with adjacent text' do
-        doc = filter("See (#{reference}.)")
-
-        exp = Regexp.escape(range.to_s)
-        expect(doc.to_html).to match(/\(<a.+>#{exp}<\/a>\.\)/)
-      end
-
-      it 'ignores invalid commit IDs' do
-        exp = act = "See #{commit1.id.reverse}...#{commit2.id}"
-
-        expect(project).to receive(:valid_repo?).and_return(true)
-        expect(project.repository).to receive(:commit).with(commit1.id.reverse)
-        expect(filter(act).to_html).to eq exp
-      end
-
-      it 'includes a title attribute' do
-        doc = filter("See #{reference}")
-        expect(doc.css('a').first.attr('title')).to eq range.reference_title
-      end
-
-      it 'includes default classes' do
-        doc = filter("See #{reference}")
-        expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-commit_range'
-      end
-
-      it 'includes a data-project attribute' do
-        doc = filter("See #{reference}")
-        link = doc.css('a').first
-
-        expect(link).to have_attribute('data-project')
-        expect(link.attr('data-project')).to eq project.id.to_s
-      end
-
-      it 'includes a data-commit-range attribute' do
-        doc = filter("See #{reference}")
-        link = doc.css('a').first
-
-        expect(link).to have_attribute('data-commit-range')
-        expect(link.attr('data-commit-range')).to eq range.to_reference
-      end
-
-      it 'supports an :only_path option' do
-        doc = filter("See #{reference}", only_path: true)
-        link = doc.css('a').first.attr('href')
-
-        expect(link).not_to match %r(https?://)
-        expect(link).to eq urls.namespace_project_compare_url(project.namespace, project, from: commit1.id, to: commit2.id, only_path: true)
-      end
-
-      it 'adds to the results hash' do
-        result = reference_pipeline_result("See #{reference}")
-        expect(result[:references][:commit_range]).not_to be_empty
-      end
-    end
-
-    context 'cross-project reference' do
-      let(:namespace) { create(:namespace, name: 'cross-reference') }
-      let(:project2)  { create(:project, :public, namespace: namespace) }
-      let(:reference) { range.to_reference(project) }
-
-      before do
-        range.project = project2
-      end
-
-      it 'links to a valid reference' do
-        doc = filter("See #{reference}")
-
-        expect(doc.css('a').first.attr('href')).
-          to eq urls.namespace_project_compare_url(project2.namespace, project2, range.to_param)
-      end
-
-      it 'links with adjacent text' do
-        doc = filter("Fixed (#{reference}.)")
-
-        exp = Regexp.escape("#{project2.to_reference}@#{range.to_s}")
-        expect(doc.to_html).to match(/\(<a.+>#{exp}<\/a>\.\)/)
-      end
-
-      it 'ignores invalid commit IDs on the referenced project' do
-        exp = act = "Fixed #{project2.to_reference}@#{commit1.id.reverse}...#{commit2.id}"
-        expect(filter(act).to_html).to eq exp
-
-        exp = act = "Fixed #{project2.to_reference}@#{commit1.id}...#{commit2.id.reverse}"
-        expect(filter(act).to_html).to eq exp
-      end
-
-      it 'adds to the results hash' do
-        result = reference_pipeline_result("See #{reference}")
-        expect(result[:references][:commit_range]).not_to be_empty
-      end
-    end
-  end
-end
diff --git a/spec/lib/gitlab/markdown/commit_reference_filter_spec.rb b/spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
deleted file mode 100644
index d080efbf3d4..00000000000
--- a/spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
+++ /dev/null
@@ -1,135 +0,0 @@
-require 'spec_helper'
-
-module Gitlab::Markdown
-  describe CommitReferenceFilter do
-    include FilterSpecHelper
-
-    let(:project) { create(:project, :public) }
-    let(:commit)  { project.commit }
-
-    it 'requires project context' do
-      expect { described_class.call('') }.to raise_error(ArgumentError, /:project/)
-    end
-
-    %w(pre code a style).each do |elem|
-      it "ignores valid references contained inside '#{elem}' element" do
-        exp = act = "<#{elem}>Commit #{commit.id}</#{elem}>"
-        expect(filter(act).to_html).to eq exp
-      end
-    end
-
-    context 'internal reference' do
-      let(:reference) { commit.id }
-
-      # Let's test a variety of commit SHA sizes just to be paranoid
-      [6, 8, 12, 18, 20, 32, 40].each do |size|
-        it "links to a valid reference of #{size} characters" do
-          doc = filter("See #{reference[0...size]}")
-
-          expect(doc.css('a').first.text).to eq commit.short_id
-          expect(doc.css('a').first.attr('href')).
-            to eq urls.namespace_project_commit_url(project.namespace, project, reference)
-        end
-      end
-
-      it 'always uses the short ID as the link text' do
-        doc = filter("See #{commit.id}")
-        expect(doc.text).to eq "See #{commit.short_id}"
-
-        doc = filter("See #{commit.id[0...6]}")
-        expect(doc.text).to eq "See #{commit.short_id}"
-      end
-
-      it 'links with adjacent text' do
-        doc = filter("See (#{reference}.)")
-        expect(doc.to_html).to match(/\(<a.+>#{commit.short_id}<\/a>\.\)/)
-      end
-
-      it 'ignores invalid commit IDs' do
-        invalid = invalidate_reference(reference)
-        exp = act = "See #{invalid}"
-
-        expect(project).to receive(:valid_repo?).and_return(true)
-        expect(project.repository).to receive(:commit).with(invalid)
-        expect(filter(act).to_html).to eq exp
-      end
-
-      it 'includes a title attribute' do
-        doc = filter("See #{reference}")
-        expect(doc.css('a').first.attr('title')).to eq commit.link_title
-      end
-
-      it 'escapes the title attribute' do
-        allow_any_instance_of(Commit).to receive(:title).and_return(%{"></a>whatever<a title="})
-
-        doc = filter("See #{reference}")
-        expect(doc.text).to eq "See #{commit.short_id}"
-      end
-
-      it 'includes default classes' do
-        doc = filter("See #{reference}")
-        expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-commit'
-      end
-
-      it 'includes a data-project attribute' do
-        doc = filter("See #{reference}")
-        link = doc.css('a').first
-
-        expect(link).to have_attribute('data-project')
-        expect(link.attr('data-project')).to eq project.id.to_s
-      end
-
-      it 'includes a data-commit attribute' do
-        doc = filter("See #{reference}")
-        link = doc.css('a').first
-
-        expect(link).to have_attribute('data-commit')
-        expect(link.attr('data-commit')).to eq commit.id
-      end
-
-      it 'supports an :only_path context' do
-        doc = filter("See #{reference}", only_path: true)
-        link = doc.css('a').first.attr('href')
-
-        expect(link).not_to match %r(https?://)
-        expect(link).to eq urls.namespace_project_commit_url(project.namespace, project, reference, only_path: true)
-      end
-
-      it 'adds to the results hash' do
-        result = reference_pipeline_result("See #{reference}")
-        expect(result[:references][:commit]).not_to be_empty
-      end
-    end
-
-    context 'cross-project reference' do
-      let(:namespace) { create(:namespace, name: 'cross-reference') }
-      let(:project2)  { create(:project, :public, namespace: namespace) }
-      let(:commit)    { project2.commit }
-      let(:reference) { commit.to_reference(project) }
-
-      it 'links to a valid reference' do
-        doc = filter("See #{reference}")
-
-        expect(doc.css('a').first.attr('href')).
-          to eq urls.namespace_project_commit_url(project2.namespace, project2, commit.id)
-      end
-
-      it 'links with adjacent text' do
-        doc = filter("Fixed (#{reference}.)")
-
-        exp = Regexp.escape(project2.to_reference)
-        expect(doc.to_html).to match(/\(<a.+>#{exp}@#{commit.short_id}<\/a>\.\)/)
-      end
-
-      it 'ignores invalid commit IDs on the referenced project' do
-        exp = act = "Committed #{invalidate_reference(reference)}"
-        expect(filter(act).to_html).to eq exp
-      end
-
-      it 'adds to the results hash' do
-        result = reference_pipeline_result("See #{reference}")
-        expect(result[:references][:commit]).not_to be_empty
-      end
-    end
-  end
-end
diff --git a/spec/lib/gitlab/markdown/cross_project_reference_spec.rb b/spec/lib/gitlab/markdown/cross_project_reference_spec.rb
index 8d4f9e403a6..f86d52b9d0a 100644
--- a/spec/lib/gitlab/markdown/cross_project_reference_spec.rb
+++ b/spec/lib/gitlab/markdown/cross_project_reference_spec.rb
@@ -1,35 +1,33 @@
 require 'spec_helper'
 
-module Gitlab::Markdown
-  describe CrossProjectReference do
-    include described_class
+describe Gitlab::Markdown::CrossProjectReference do
+  include described_class
 
-    describe '#project_from_ref' do
-      context 'when no project was referenced' do
-        it 'returns the project from context' do
-          project = double
+  describe '#project_from_ref' do
+    context 'when no project was referenced' do
+      it 'returns the project from context' do
+        project = double
 
-          allow(self).to receive(:context).and_return({ project: project })
+        allow(self).to receive(:context).and_return({ project: project })
 
-          expect(project_from_ref(nil)).to eq project
-        end
+        expect(project_from_ref(nil)).to eq project
       end
+    end
 
-      context 'when referenced project does not exist' do
-        it 'returns nil' do
-          expect(project_from_ref('invalid/reference')).to be_nil
-        end
+    context 'when referenced project does not exist' do
+      it 'returns nil' do
+        expect(project_from_ref('invalid/reference')).to be_nil
       end
+    end
 
-      context 'when referenced project exists' do
-        it 'returns the referenced project' do
-          project2 = double('referenced project')
+    context 'when referenced project exists' do
+      it 'returns the referenced project' do
+        project2 = double('referenced project')
 
-          expect(Project).to receive(:find_with_namespace).
-            with('cross/reference').and_return(project2)
+        expect(Project).to receive(:find_with_namespace).
+          with('cross/reference').and_return(project2)
 
-          expect(project_from_ref('cross/reference')).to eq project2
-        end
+        expect(project_from_ref('cross/reference')).to eq project2
       end
     end
   end
diff --git a/spec/lib/gitlab/markdown/emoji_filter_spec.rb b/spec/lib/gitlab/markdown/emoji_filter_spec.rb
deleted file mode 100644
index 11efd9bb4cd..00000000000
--- a/spec/lib/gitlab/markdown/emoji_filter_spec.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-require 'spec_helper'
-
-module Gitlab::Markdown
-  describe EmojiFilter do
-    include FilterSpecHelper
-
-    before do
-      ActionController::Base.asset_host = 'https://foo.com'
-    end
-
-    it 'replaces supported emoji' do
-      doc = filter('<p>:heart:</p>')
-      expect(doc.css('img').first.attr('src')).to eq 'https://foo.com/assets/emoji/2764.png'
-    end
-
-    it 'ignores unsupported emoji' do
-      exp = act = '<p>:foo:</p>'
-      doc = filter(act)
-      expect(doc.to_html).to match Regexp.escape(exp)
-    end
-
-    it 'correctly encodes the URL' do
-      doc = filter('<p>:+1:</p>')
-      expect(doc.css('img').first.attr('src')).to eq 'https://foo.com/assets/emoji/1F44D.png'
-    end
-
-    it 'matches at the start of a string' do
-      doc = filter(':+1:')
-      expect(doc.css('img').size).to eq 1
-    end
-
-    it 'matches at the end of a string' do
-      doc = filter('This gets a :-1:')
-      expect(doc.css('img').size).to eq 1
-    end
-
-    it 'matches with adjacent text' do
-      doc = filter('+1 (:+1:)')
-      expect(doc.css('img').size).to eq 1
-    end
-
-    it 'matches multiple emoji in a row' do
-      doc = filter(':see_no_evil::hear_no_evil::speak_no_evil:')
-      expect(doc.css('img').size).to eq 3
-    end
-
-    it 'has a title attribute' do
-      doc = filter(':-1:')
-      expect(doc.css('img').first.attr('title')).to eq ':-1:'
-    end
-
-    it 'has an alt attribute' do
-      doc = filter(':-1:')
-      expect(doc.css('img').first.attr('alt')).to eq ':-1:'
-    end
-
-    it 'has an align attribute' do
-      doc = filter(':8ball:')
-      expect(doc.css('img').first.attr('align')).to eq 'absmiddle'
-    end
-
-    it 'has an emoji class' do
-      doc = filter(':cat:')
-      expect(doc.css('img').first.attr('class')).to eq 'emoji'
-    end
-
-    it 'has height and width attributes' do
-      doc = filter(':dog:')
-      img = doc.css('img').first
-
-      expect(img.attr('width')).to eq '20'
-      expect(img.attr('height')).to eq '20'
-    end
-
-    it 'keeps whitespace intact' do
-      doc = filter('This deserves a :+1:, big time.')
-
-      expect(doc.to_html).to match(/^This deserves a <img.+>, big time\.\z/)
-    end
-
-    it 'uses a custom asset_root context' do
-      root = Gitlab.config.gitlab.url + 'gitlab/root'
-
-      doc = filter(':smile:', asset_root: root)
-      expect(doc.css('img').first.attr('src')).to start_with(root)
-    end
-
-    it 'uses a custom asset_host context' do
-      ActionController::Base.asset_host = 'https://cdn.example.com'
-
-      doc = filter(':frowning:', asset_host: 'https://this-is-ignored-i-guess?')
-      expect(doc.css('img').first.attr('src')).to start_with('https://cdn.example.com')
-    end
-  end
-end
diff --git a/spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb b/spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb
deleted file mode 100644
index d8c2970b6bd..00000000000
--- a/spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-require 'spec_helper'
-
-module Gitlab::Markdown
-  describe ExternalIssueReferenceFilter do
-    include FilterSpecHelper
-
-    def helper
-      IssuesHelper
-    end
-
-    let(:project) { create(:jira_project) }
-
-    context 'JIRA issue references' do
-      let(:issue)     { ExternalIssue.new('JIRA-123', project) }
-      let(:reference) { issue.to_reference }
-
-      it 'requires project context' do
-        expect { described_class.call('') }.to raise_error(ArgumentError, /:project/)
-      end
-
-      %w(pre code a style).each do |elem|
-        it "ignores valid references contained inside '#{elem}' element" do
-          exp = act = "<#{elem}>Issue #{reference}</#{elem}>"
-          expect(filter(act).to_html).to eq exp
-        end
-      end
-
-      it 'ignores valid references when using default tracker' do
-        expect(project).to receive(:default_issues_tracker?).and_return(true)
-
-        exp = act = "Issue #{reference}"
-        expect(filter(act).to_html).to eq exp
-      end
-
-      it 'links to a valid reference' do
-        doc = filter("Issue #{reference}")
-        expect(doc.css('a').first.attr('href'))
-          .to eq helper.url_for_issue(reference, project)
-      end
-
-      it 'links to the external tracker' do
-        doc = filter("Issue #{reference}")
-        link = doc.css('a').first.attr('href')
-
-        expect(link).to eq "http://jira.example/browse/#{reference}"
-      end
-
-      it 'links with adjacent text' do
-        doc = filter("Issue (#{reference}.)")
-        expect(doc.to_html).to match(/\(<a.+>#{reference}<\/a>\.\)/)
-      end
-
-      it 'includes a title attribute' do
-        doc = filter("Issue #{reference}")
-        expect(doc.css('a').first.attr('title')).to eq "Issue in JIRA tracker"
-      end
-
-      it 'escapes the title attribute' do
-        allow(project.external_issue_tracker).to receive(:title).
-          and_return(%{"></a>whatever<a title="})
-
-        doc = filter("Issue #{reference}")
-        expect(doc.text).to eq "Issue #{reference}"
-      end
-
-      it 'includes default classes' do
-        doc = filter("Issue #{reference}")
-        expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-issue'
-      end
-
-      it 'supports an :only_path context' do
-        doc = filter("Issue #{reference}", only_path: true)
-        link = doc.css('a').first.attr('href')
-
-        expect(link).to eq helper.url_for_issue("#{reference}", project, only_path: true)
-      end
-    end
-  end
-end
diff --git a/spec/lib/gitlab/markdown/external_link_filter_spec.rb b/spec/lib/gitlab/markdown/external_link_filter_spec.rb
deleted file mode 100644
index a040b34577b..00000000000
--- a/spec/lib/gitlab/markdown/external_link_filter_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-require 'spec_helper'
-
-module Gitlab::Markdown
-  describe ExternalLinkFilter do
-    include FilterSpecHelper
-
-    it 'ignores elements without an href attribute' do
-      exp = act = %q(<a id="ignored">Ignore Me</a>)
-      expect(filter(act).to_html).to eq exp
-    end
-
-    it 'ignores non-HTTP(S) links' do
-      exp = act = %q(<a href="irc://irc.freenode.net/gitlab">IRC</a>)
-      expect(filter(act).to_html).to eq exp
-    end
-
-    it 'skips internal links' do
-      internal = Gitlab.config.gitlab.url
-      exp = act = %Q(<a href="#{internal}/sign_in">Login</a>)
-      expect(filter(act).to_html).to eq exp
-    end
-
-    it 'adds rel="nofollow" to external links' do
-      act = %q(<a href="https://google.com/">Google</a>)
-      doc = filter(act)
-
-      expect(doc.at_css('a')).to have_attribute('rel')
-      expect(doc.at_css('a')['rel']).to eq 'nofollow'
-    end
-  end
-end
diff --git a/spec/lib/gitlab/markdown/filter/autolink_filter_spec.rb b/spec/lib/gitlab/markdown/filter/autolink_filter_spec.rb
new file mode 100644
index 00000000000..837bdb56f74
--- /dev/null
+++ b/spec/lib/gitlab/markdown/filter/autolink_filter_spec.rb
@@ -0,0 +1,112 @@
+require 'spec_helper'
+
+describe Gitlab::Markdown::AutolinkFilter do
+  include FilterSpecHelper
+
+  let(:link) { 'http://about.gitlab.com/' }
+
+  it 'does nothing when :autolink is false' do
+    exp = act = link
+    expect(filter(act, autolink: false).to_html).to eq exp
+  end
+
+  it 'does nothing with non-link text' do
+    exp = act = 'This text contains no links to autolink'
+    expect(filter(act).to_html).to eq exp
+  end
+
+  context 'Rinku schemes' do
+    it 'autolinks http' do
+      doc = filter("See #{link}")
+      expect(doc.at_css('a').text).to eq link
+      expect(doc.at_css('a')['href']).to eq link
+    end
+
+    it 'autolinks https' do
+      link = 'https://google.com/'
+      doc = filter("See #{link}")
+
+      expect(doc.at_css('a').text).to eq link
+      expect(doc.at_css('a')['href']).to eq link
+    end
+
+    it 'autolinks ftp' do
+      link = 'ftp://ftp.us.debian.org/debian/'
+      doc = filter("See #{link}")
+
+      expect(doc.at_css('a').text).to eq link
+      expect(doc.at_css('a')['href']).to eq link
+    end
+
+    it 'autolinks short URLs' do
+      link = 'http://localhost:3000/'
+      doc = filter("See #{link}")
+
+      expect(doc.at_css('a').text).to eq link
+      expect(doc.at_css('a')['href']).to eq link
+    end
+
+    it 'accepts link_attr options' do
+      doc = filter("See #{link}", link_attr: { class: 'custom' })
+
+      expect(doc.at_css('a')['class']).to eq 'custom'
+    end
+
+    described_class::IGNORE_PARENTS.each do |elem|
+      it "ignores valid links contained inside '#{elem}' element" do
+        exp = act = "<#{elem}>See #{link}</#{elem}>"
+        expect(filter(act).to_html).to eq exp
+      end
+    end
+  end
+
+  context 'other schemes' do
+    let(:link) { 'foo://bar.baz/' }
+
+    it 'autolinks smb' do
+      link = 'smb:///Volumes/shared/foo.pdf'
+      doc = filter("See #{link}")
+
+      expect(doc.at_css('a').text).to eq link
+      expect(doc.at_css('a')['href']).to eq link
+    end
+
+    it 'autolinks irc' do
+      link = 'irc://irc.freenode.net/git'
+      doc = filter("See #{link}")
+
+      expect(doc.at_css('a').text).to eq link
+      expect(doc.at_css('a')['href']).to eq link
+    end
+
+    it 'does not include trailing punctuation' do
+      doc = filter("See #{link}.")
+      expect(doc.at_css('a').text).to eq link
+
+      doc = filter("See #{link}, ok?")
+      expect(doc.at_css('a').text).to eq link
+
+      doc = filter("See #{link}...")
+      expect(doc.at_css('a').text).to eq link
+    end
+
+    it 'does not include trailing HTML entities' do
+      doc = filter("See &lt;&lt;&lt;#{link}&gt;&gt;&gt;")
+
+      expect(doc.at_css('a')['href']).to eq link
+      expect(doc.text).to eq "See <<<#{link}>>>"
+    end
+
+    it 'accepts link_attr options' do
+      doc = filter("See #{link}", link_attr: { class: 'custom' })
+      expect(doc.at_css('a')['class']).to eq 'custom'
+    end
+
+    described_class::IGNORE_PARENTS.each do |elem|
+      it "ignores valid links contained inside '#{elem}' element" do
+        exp = act = "<#{elem}>See #{link}</#{elem}>"
+        expect(filter(act).to_html).to eq exp
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/markdown/filter/commit_range_reference_filter_spec.rb b/spec/lib/gitlab/markdown/filter/commit_range_reference_filter_spec.rb
new file mode 100644
index 00000000000..05def97a9e8
--- /dev/null
+++ b/spec/lib/gitlab/markdown/filter/commit_range_reference_filter_spec.rb
@@ -0,0 +1,143 @@
+require 'spec_helper'
+
+describe Gitlab::Markdown::CommitRangeReferenceFilter do
+  include FilterSpecHelper
+
+  let(:project) { create(:project, :public) }
+  let(:commit1) { project.commit }
+  let(:commit2) { project.commit("HEAD~2") }
+
+  let(:range)  { CommitRange.new("#{commit1.id}...#{commit2.id}") }
+  let(:range2) { CommitRange.new("#{commit1.id}..#{commit2.id}") }
+
+  it 'requires project context' do
+    expect { described_class.call('') }.to raise_error(ArgumentError, /:project/)
+  end
+
+  %w(pre code a style).each do |elem|
+    it "ignores valid references contained inside '#{elem}' element" do
+      exp = act = "<#{elem}>Commit Range #{range.to_reference}</#{elem}>"
+      expect(filter(act).to_html).to eq exp
+    end
+  end
+
+  context 'internal reference' do
+    let(:reference)  { range.to_reference }
+    let(:reference2) { range2.to_reference }
+
+    it 'links to a valid two-dot reference' do
+      doc = filter("See #{reference2}")
+
+      expect(doc.css('a').first.attr('href')).
+        to eq urls.namespace_project_compare_url(project.namespace, project, range2.to_param)
+    end
+
+    it 'links to a valid three-dot reference' do
+      doc = filter("See #{reference}")
+
+      expect(doc.css('a').first.attr('href')).
+        to eq urls.namespace_project_compare_url(project.namespace, project, range.to_param)
+    end
+
+    it 'links to a valid short ID' do
+      reference = "#{commit1.short_id}...#{commit2.id}"
+      reference2 = "#{commit1.id}...#{commit2.short_id}"
+
+      exp = commit1.short_id + '...' + commit2.short_id
+
+      expect(filter("See #{reference}").css('a').first.text).to eq exp
+      expect(filter("See #{reference2}").css('a').first.text).to eq exp
+    end
+
+    it 'links with adjacent text' do
+      doc = filter("See (#{reference}.)")
+
+      exp = Regexp.escape(range.to_s)
+      expect(doc.to_html).to match(/\(<a.+>#{exp}<\/a>\.\)/)
+    end
+
+    it 'ignores invalid commit IDs' do
+      exp = act = "See #{commit1.id.reverse}...#{commit2.id}"
+
+      expect(project).to receive(:valid_repo?).and_return(true)
+      expect(project.repository).to receive(:commit).with(commit1.id.reverse)
+      expect(filter(act).to_html).to eq exp
+    end
+
+    it 'includes a title attribute' do
+      doc = filter("See #{reference}")
+      expect(doc.css('a').first.attr('title')).to eq range.reference_title
+    end
+
+    it 'includes default classes' do
+      doc = filter("See #{reference}")
+      expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-commit_range'
+    end
+
+    it 'includes a data-project attribute' do
+      doc = filter("See #{reference}")
+      link = doc.css('a').first
+
+      expect(link).to have_attribute('data-project')
+      expect(link.attr('data-project')).to eq project.id.to_s
+    end
+
+    it 'includes a data-commit-range attribute' do
+      doc = filter("See #{reference}")
+      link = doc.css('a').first
+
+      expect(link).to have_attribute('data-commit-range')
+      expect(link.attr('data-commit-range')).to eq range.to_reference
+    end
+
+    it 'supports an :only_path option' do
+      doc = filter("See #{reference}", only_path: true)
+      link = doc.css('a').first.attr('href')
+
+      expect(link).not_to match %r(https?://)
+      expect(link).to eq urls.namespace_project_compare_url(project.namespace, project, from: commit1.id, to: commit2.id, only_path: true)
+    end
+
+    it 'adds to the results hash' do
+      result = reference_pipeline_result("See #{reference}")
+      expect(result[:references][:commit_range]).not_to be_empty
+    end
+  end
+
+  context 'cross-project reference' do
+    let(:namespace) { create(:namespace, name: 'cross-reference') }
+    let(:project2)  { create(:project, :public, namespace: namespace) }
+    let(:reference) { range.to_reference(project) }
+
+    before do
+      range.project = project2
+    end
+
+    it 'links to a valid reference' do
+      doc = filter("See #{reference}")
+
+      expect(doc.css('a').first.attr('href')).
+        to eq urls.namespace_project_compare_url(project2.namespace, project2, range.to_param)
+    end
+
+    it 'links with adjacent text' do
+      doc = filter("Fixed (#{reference}.)")
+
+      exp = Regexp.escape("#{project2.to_reference}@#{range.to_s}")
+      expect(doc.to_html).to match(/\(<a.+>#{exp}<\/a>\.\)/)
+    end
+
+    it 'ignores invalid commit IDs on the referenced project' do
+      exp = act = "Fixed #{project2.to_reference}@#{commit1.id.reverse}...#{commit2.id}"
+      expect(filter(act).to_html).to eq exp
+
+      exp = act = "Fixed #{project2.to_reference}@#{commit1.id}...#{commit2.id.reverse}"
+      expect(filter(act).to_html).to eq exp
+    end
+
+    it 'adds to the results hash' do
+      result = reference_pipeline_result("See #{reference}")
+      expect(result[:references][:commit_range]).not_to be_empty
+    end
+  end
+end
diff --git a/spec/lib/gitlab/markdown/filter/commit_reference_filter_spec.rb b/spec/lib/gitlab/markdown/filter/commit_reference_filter_spec.rb
new file mode 100644
index 00000000000..0a892a12b93
--- /dev/null
+++ b/spec/lib/gitlab/markdown/filter/commit_reference_filter_spec.rb
@@ -0,0 +1,133 @@
+require 'spec_helper'
+
+describe Gitlab::Markdown::CommitReferenceFilter do
+  include FilterSpecHelper
+
+  let(:project) { create(:project, :public) }
+  let(:commit)  { project.commit }
+
+  it 'requires project context' do
+    expect { described_class.call('') }.to raise_error(ArgumentError, /:project/)
+  end
+
+  %w(pre code a style).each do |elem|
+    it "ignores valid references contained inside '#{elem}' element" do
+      exp = act = "<#{elem}>Commit #{commit.id}</#{elem}>"
+      expect(filter(act).to_html).to eq exp
+    end
+  end
+
+  context 'internal reference' do
+    let(:reference) { commit.id }
+
+    # Let's test a variety of commit SHA sizes just to be paranoid
+    [6, 8, 12, 18, 20, 32, 40].each do |size|
+      it "links to a valid reference of #{size} characters" do
+        doc = filter("See #{reference[0...size]}")
+
+        expect(doc.css('a').first.text).to eq commit.short_id
+        expect(doc.css('a').first.attr('href')).
+          to eq urls.namespace_project_commit_url(project.namespace, project, reference)
+      end
+    end
+
+    it 'always uses the short ID as the link text' do
+      doc = filter("See #{commit.id}")
+      expect(doc.text).to eq "See #{commit.short_id}"
+
+      doc = filter("See #{commit.id[0...6]}")
+      expect(doc.text).to eq "See #{commit.short_id}"
+    end
+
+    it 'links with adjacent text' do
+      doc = filter("See (#{reference}.)")
+      expect(doc.to_html).to match(/\(<a.+>#{commit.short_id}<\/a>\.\)/)
+    end
+
+    it 'ignores invalid commit IDs' do
+      invalid = invalidate_reference(reference)
+      exp = act = "See #{invalid}"
+
+      expect(project).to receive(:valid_repo?).and_return(true)
+      expect(project.repository).to receive(:commit).with(invalid)
+      expect(filter(act).to_html).to eq exp
+    end
+
+    it 'includes a title attribute' do
+      doc = filter("See #{reference}")
+      expect(doc.css('a').first.attr('title')).to eq commit.link_title
+    end
+
+    it 'escapes the title attribute' do
+      allow_any_instance_of(Commit).to receive(:title).and_return(%{"></a>whatever<a title="})
+
+      doc = filter("See #{reference}")
+      expect(doc.text).to eq "See #{commit.short_id}"
+    end
+
+    it 'includes default classes' do
+      doc = filter("See #{reference}")
+      expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-commit'
+    end
+
+    it 'includes a data-project attribute' do
+      doc = filter("See #{reference}")
+      link = doc.css('a').first
+
+      expect(link).to have_attribute('data-project')
+      expect(link.attr('data-project')).to eq project.id.to_s
+    end
+
+    it 'includes a data-commit attribute' do
+      doc = filter("See #{reference}")
+      link = doc.css('a').first
+
+      expect(link).to have_attribute('data-commit')
+      expect(link.attr('data-commit')).to eq commit.id
+    end
+
+    it 'supports an :only_path context' do
+      doc = filter("See #{reference}", only_path: true)
+      link = doc.css('a').first.attr('href')
+
+      expect(link).not_to match %r(https?://)
+      expect(link).to eq urls.namespace_project_commit_url(project.namespace, project, reference, only_path: true)
+    end
+
+    it 'adds to the results hash' do
+      result = reference_pipeline_result("See #{reference}")
+      expect(result[:references][:commit]).not_to be_empty
+    end
+  end
+
+  context 'cross-project reference' do
+    let(:namespace) { create(:namespace, name: 'cross-reference') }
+    let(:project2)  { create(:project, :public, namespace: namespace) }
+    let(:commit)    { project2.commit }
+    let(:reference) { commit.to_reference(project) }
+
+    it 'links to a valid reference' do
+      doc = filter("See #{reference}")
+
+      expect(doc.css('a').first.attr('href')).
+        to eq urls.namespace_project_commit_url(project2.namespace, project2, commit.id)
+    end
+
+    it 'links with adjacent text' do
+      doc = filter("Fixed (#{reference}.)")
+
+      exp = Regexp.escape(project2.to_reference)
+      expect(doc.to_html).to match(/\(<a.+>#{exp}@#{commit.short_id}<\/a>\.\)/)
+    end
+
+    it 'ignores invalid commit IDs on the referenced project' do
+      exp = act = "Committed #{invalidate_reference(reference)}"
+      expect(filter(act).to_html).to eq exp
+    end
+
+    it 'adds to the results hash' do
+      result = reference_pipeline_result("See #{reference}")
+      expect(result[:references][:commit]).not_to be_empty
+    end
+  end
+end
diff --git a/spec/lib/gitlab/markdown/filter/emoji_filter_spec.rb b/spec/lib/gitlab/markdown/filter/emoji_filter_spec.rb
new file mode 100644
index 00000000000..e0c5622e85d
--- /dev/null
+++ b/spec/lib/gitlab/markdown/filter/emoji_filter_spec.rb
@@ -0,0 +1,98 @@
+require 'spec_helper'
+
+describe Gitlab::Markdown::EmojiFilter do
+  include FilterSpecHelper
+
+  before do
+    @original_asset_host = ActionController::Base.asset_host
+    ActionController::Base.asset_host = 'https://foo.com'
+  end
+
+  after do
+    ActionController::Base.asset_host = @original_asset_host
+  end
+
+  it 'replaces supported emoji' do
+    doc = filter('<p>:heart:</p>')
+    expect(doc.css('img').first.attr('src')).to eq 'https://foo.com/assets/emoji/2764.png'
+  end
+
+  it 'ignores unsupported emoji' do
+    exp = act = '<p>:foo:</p>'
+    doc = filter(act)
+    expect(doc.to_html).to match Regexp.escape(exp)
+  end
+
+  it 'correctly encodes the URL' do
+    doc = filter('<p>:+1:</p>')
+    expect(doc.css('img').first.attr('src')).to eq 'https://foo.com/assets/emoji/1F44D.png'
+  end
+
+  it 'matches at the start of a string' do
+    doc = filter(':+1:')
+    expect(doc.css('img').size).to eq 1
+  end
+
+  it 'matches at the end of a string' do
+    doc = filter('This gets a :-1:')
+    expect(doc.css('img').size).to eq 1
+  end
+
+  it 'matches with adjacent text' do
+    doc = filter('+1 (:+1:)')
+    expect(doc.css('img').size).to eq 1
+  end
+
+  it 'matches multiple emoji in a row' do
+    doc = filter(':see_no_evil::hear_no_evil::speak_no_evil:')
+    expect(doc.css('img').size).to eq 3
+  end
+
+  it 'has a title attribute' do
+    doc = filter(':-1:')
+    expect(doc.css('img').first.attr('title')).to eq ':-1:'
+  end
+
+  it 'has an alt attribute' do
+    doc = filter(':-1:')
+    expect(doc.css('img').first.attr('alt')).to eq ':-1:'
+  end
+
+  it 'has an align attribute' do
+    doc = filter(':8ball:')
+    expect(doc.css('img').first.attr('align')).to eq 'absmiddle'
+  end
+
+  it 'has an emoji class' do
+    doc = filter(':cat:')
+    expect(doc.css('img').first.attr('class')).to eq 'emoji'
+  end
+
+  it 'has height and width attributes' do
+    doc = filter(':dog:')
+    img = doc.css('img').first
+
+    expect(img.attr('width')).to eq '20'
+    expect(img.attr('height')).to eq '20'
+  end
+
+  it 'keeps whitespace intact' do
+    doc = filter('This deserves a :+1:, big time.')
+
+    expect(doc.to_html).to match(/^This deserves a <img.+>, big time\.\z/)
+  end
+
+  it 'uses a custom asset_root context' do
+    root = Gitlab.config.gitlab.url + 'gitlab/root'
+
+    doc = filter(':smile:', asset_root: root)
+    expect(doc.css('img').first.attr('src')).to start_with(root)
+  end
+
+  it 'uses a custom asset_host context' do
+    ActionController::Base.asset_host = 'https://cdn.example.com'
+
+    doc = filter(':frowning:', asset_host: 'https://this-is-ignored-i-guess?')
+    expect(doc.css('img').first.attr('src')).to start_with('https://cdn.example.com')
+  end
+end
diff --git a/spec/lib/gitlab/markdown/filter/external_issue_reference_filter_spec.rb b/spec/lib/gitlab/markdown/filter/external_issue_reference_filter_spec.rb
new file mode 100644
index 00000000000..216fcb66cef
--- /dev/null
+++ b/spec/lib/gitlab/markdown/filter/external_issue_reference_filter_spec.rb
@@ -0,0 +1,77 @@
+require 'spec_helper'
+
+describe Gitlab::Markdown::ExternalIssueReferenceFilter do
+  include FilterSpecHelper
+
+  def helper
+    IssuesHelper
+  end
+
+  let(:project) { create(:jira_project) }
+
+  context 'JIRA issue references' do
+    let(:issue)     { ExternalIssue.new('JIRA-123', project) }
+    let(:reference) { issue.to_reference }
+
+    it 'requires project context' do
+      expect { described_class.call('') }.to raise_error(ArgumentError, /:project/)
+    end
+
+    %w(pre code a style).each do |elem|
+      it "ignores valid references contained inside '#{elem}' element" do
+        exp = act = "<#{elem}>Issue #{reference}</#{elem}>"
+        expect(filter(act).to_html).to eq exp
+      end
+    end
+
+    it 'ignores valid references when using default tracker' do
+      expect(project).to receive(:default_issues_tracker?).and_return(true)
+
+      exp = act = "Issue #{reference}"
+      expect(filter(act).to_html).to eq exp
+    end
+
+    it 'links to a valid reference' do
+      doc = filter("Issue #{reference}")
+      expect(doc.css('a').first.attr('href'))
+        .to eq helper.url_for_issue(reference, project)
+    end
+
+    it 'links to the external tracker' do
+      doc = filter("Issue #{reference}")
+      link = doc.css('a').first.attr('href')
+
+      expect(link).to eq "http://jira.example/browse/#{reference}"
+    end
+
+    it 'links with adjacent text' do
+      doc = filter("Issue (#{reference}.)")
+      expect(doc.to_html).to match(/\(<a.+>#{reference}<\/a>\.\)/)
+    end
+
+    it 'includes a title attribute' do
+      doc = filter("Issue #{reference}")
+      expect(doc.css('a').first.attr('title')).to eq "Issue in JIRA tracker"
+    end
+
+    it 'escapes the title attribute' do
+      allow(project.external_issue_tracker).to receive(:title).
+        and_return(%{"></a>whatever<a title="})
+
+      doc = filter("Issue #{reference}")
+      expect(doc.text).to eq "Issue #{reference}"
+    end
+
+    it 'includes default classes' do
+      doc = filter("Issue #{reference}")
+      expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-issue'
+    end
+
+    it 'supports an :only_path context' do
+      doc = filter("Issue #{reference}", only_path: true)
+      link = doc.css('a').first.attr('href')
+
+      expect(link).to eq helper.url_for_issue("#{reference}", project, only_path: true)
+    end
+  end
+end
diff --git a/spec/lib/gitlab/markdown/filter/external_link_filter_spec.rb b/spec/lib/gitlab/markdown/filter/external_link_filter_spec.rb
new file mode 100644
index 00000000000..20d37e0c978
--- /dev/null
+++ b/spec/lib/gitlab/markdown/filter/external_link_filter_spec.rb
@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe Gitlab::Markdown::ExternalLinkFilter do
+  include FilterSpecHelper
+
+  it 'ignores elements without an href attribute' do
+    exp = act = %q(<a id="ignored">Ignore Me</a>)
+    expect(filter(act).to_html).to eq exp
+  end
+
+  it 'ignores non-HTTP(S) links' do
+    exp = act = %q(<a href="irc://irc.freenode.net/gitlab">IRC</a>)
+    expect(filter(act).to_html).to eq exp
+  end
+
+  it 'skips internal links' do
+    internal = Gitlab.config.gitlab.url
+    exp = act = %Q(<a href="#{internal}/sign_in">Login</a>)
+    expect(filter(act).to_html).to eq exp
+  end
+
+  it 'adds rel="nofollow" to external links' do
+    act = %q(<a href="https://google.com/">Google</a>)
+    doc = filter(act)
+
+    expect(doc.at_css('a')).to have_attribute('rel')
+    expect(doc.at_css('a')['rel']).to eq 'nofollow'
+  end
+end
diff --git a/spec/lib/gitlab/markdown/filter/issue_reference_filter_spec.rb b/spec/lib/gitlab/markdown/filter/issue_reference_filter_spec.rb
new file mode 100644
index 00000000000..66eac4f2e34
--- /dev/null
+++ b/spec/lib/gitlab/markdown/filter/issue_reference_filter_spec.rb
@@ -0,0 +1,137 @@
+require 'spec_helper'
+
+describe Gitlab::Markdown::IssueReferenceFilter do
+  include FilterSpecHelper
+
+  def helper
+    IssuesHelper
+  end
+
+  let(:project) { create(:empty_project, :public) }
+  let(:issue)   { create(:issue, project: project) }
+
+  it 'requires project context' do
+    expect { described_class.call('') }.to raise_error(ArgumentError, /:project/)
+  end
+
+  %w(pre code a style).each do |elem|
+    it "ignores valid references contained inside '#{elem}' element" do
+      exp = act = "<#{elem}>Issue #{issue.to_reference}</#{elem}>"
+      expect(filter(act).to_html).to eq exp
+    end
+  end
+
+  context 'internal reference' do
+    let(:reference) { issue.to_reference }
+
+    it 'ignores valid references when using non-default tracker' do
+      expect(project).to receive(:get_issue).with(issue.iid).and_return(nil)
+
+      exp = act = "Issue #{reference}"
+      expect(filter(act).to_html).to eq exp
+    end
+
+    it 'links to a valid reference' do
+      doc = filter("Fixed #{reference}")
+
+      expect(doc.css('a').first.attr('href')).
+        to eq helper.url_for_issue(issue.iid, project)
+    end
+
+    it 'links with adjacent text' do
+      doc = filter("Fixed (#{reference}.)")
+      expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
+    end
+
+    it 'ignores invalid issue IDs' do
+      invalid = invalidate_reference(reference)
+      exp = act = "Fixed #{invalid}"
+
+      expect(filter(act).to_html).to eq exp
+    end
+
+    it 'includes a title attribute' do
+      doc = filter("Issue #{reference}")
+      expect(doc.css('a').first.attr('title')).to eq "Issue: #{issue.title}"
+    end
+
+    it 'escapes the title attribute' do
+      issue.update_attribute(:title, %{"></a>whatever<a title="})
+
+      doc = filter("Issue #{reference}")
+      expect(doc.text).to eq "Issue #{reference}"
+    end
+
+    it 'includes default classes' do
+      doc = filter("Issue #{reference}")
+      expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-issue'
+    end
+
+    it 'includes a data-project attribute' do
+      doc = filter("Issue #{reference}")
+      link = doc.css('a').first
+
+      expect(link).to have_attribute('data-project')
+      expect(link.attr('data-project')).to eq project.id.to_s
+    end
+
+    it 'includes a data-issue attribute' do
+      doc = filter("See #{reference}")
+      link = doc.css('a').first
+
+      expect(link).to have_attribute('data-issue')
+      expect(link.attr('data-issue')).to eq issue.id.to_s
+    end
+
+    it 'supports an :only_path context' do
+      doc = filter("Issue #{reference}", only_path: true)
+      link = doc.css('a').first.attr('href')
+
+      expect(link).not_to match %r(https?://)
+      expect(link).to eq helper.url_for_issue(issue.iid, project, only_path: true)
+    end
+
+    it 'adds to the results hash' do
+      result = reference_pipeline_result("Fixed #{reference}")
+      expect(result[:references][:issue]).to eq [issue]
+    end
+  end
+
+  context 'cross-project reference' do
+    let(:namespace) { create(:namespace, name: 'cross-reference') }
+    let(:project2)  { create(:empty_project, :public, namespace: namespace) }
+    let(:issue)     { create(:issue, project: project2) }
+    let(:reference) { issue.to_reference(project) }
+
+    it 'ignores valid references when cross-reference project uses external tracker' do
+      expect_any_instance_of(Project).to receive(:get_issue).
+        with(issue.iid).and_return(nil)
+
+      exp = act = "Issue #{reference}"
+      expect(filter(act).to_html).to eq exp
+    end
+
+    it 'links to a valid reference' do
+      doc = filter("See #{reference}")
+
+      expect(doc.css('a').first.attr('href')).
+        to eq helper.url_for_issue(issue.iid, project2)
+    end
+
+    it 'links with adjacent text' do
+      doc = filter("Fixed (#{reference}.)")
+      expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
+    end
+
+    it 'ignores invalid issue IDs on the referenced project' do
+      exp = act = "Fixed #{invalidate_reference(reference)}"
+
+      expect(filter(act).to_html).to eq exp
+    end
+
+    it 'adds to the results hash' do
+      result = reference_pipeline_result("Fixed #{reference}")
+      expect(result[:references][:issue]).to eq [issue]
+    end
+  end
+end
diff --git a/spec/lib/gitlab/markdown/filter/label_reference_filter_spec.rb b/spec/lib/gitlab/markdown/filter/label_reference_filter_spec.rb
new file mode 100644
index 00000000000..5403e811aa3
--- /dev/null
+++ b/spec/lib/gitlab/markdown/filter/label_reference_filter_spec.rb
@@ -0,0 +1,142 @@
+require 'spec_helper'
+require 'html/pipeline'
+
+describe Gitlab::Markdown::LabelReferenceFilter do
+  include FilterSpecHelper
+
+  let(:project)   { create(:empty_project, :public) }
+  let(:label)     { create(:label, project: project) }
+  let(:reference) { label.to_reference }
+
+  it 'requires project context' do
+    expect { described_class.call('') }.to raise_error(ArgumentError, /:project/)
+  end
+
+  %w(pre code a style).each do |elem|
+    it "ignores valid references contained inside '#{elem}' element" do
+      exp = act = "<#{elem}>Label #{reference}</#{elem}>"
+      expect(filter(act).to_html).to eq exp
+    end
+  end
+
+  it 'includes default classes' do
+    doc = filter("Label #{reference}")
+    expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-label'
+  end
+
+  it 'includes a data-project attribute' do
+    doc = filter("Label #{reference}")
+    link = doc.css('a').first
+
+    expect(link).to have_attribute('data-project')
+    expect(link.attr('data-project')).to eq project.id.to_s
+  end
+
+  it 'includes a data-label attribute' do
+    doc = filter("See #{reference}")
+    link = doc.css('a').first
+
+    expect(link).to have_attribute('data-label')
+    expect(link.attr('data-label')).to eq label.id.to_s
+  end
+
+  it 'supports an :only_path context' do
+    doc = filter("Label #{reference}", only_path: true)
+    link = doc.css('a').first.attr('href')
+
+    expect(link).not_to match %r(https?://)
+    expect(link).to eq urls.namespace_project_issues_path(project.namespace, project, label_name: label.name)
+  end
+
+  it 'adds to the results hash' do
+    result = reference_pipeline_result("Label #{reference}")
+    expect(result[:references][:label]).to eq [label]
+  end
+
+  describe 'label span element' do
+    it 'includes default classes' do
+      doc = filter("Label #{reference}")
+      expect(doc.css('a span').first.attr('class')).to eq 'label color-label'
+    end
+
+    it 'includes a style attribute' do
+      doc = filter("Label #{reference}")
+      expect(doc.css('a span').first.attr('style')).to match(/\Abackground-color: #\h{6}; color: #\h{6}\z/)
+    end
+  end
+
+  context 'Integer-based references' do
+    it 'links to a valid reference' do
+      doc = filter("See #{reference}")
+
+      expect(doc.css('a').first.attr('href')).to eq urls.
+        namespace_project_issues_url(project.namespace, project, label_name: label.name)
+    end
+
+    it 'links with adjacent text' do
+      doc = filter("Label (#{reference}.)")
+      expect(doc.to_html).to match(%r(\(<a.+><span.+>#{label.name}</span></a>\.\)))
+    end
+
+    it 'ignores invalid label IDs' do
+      exp = act = "Label #{invalidate_reference(reference)}"
+
+      expect(filter(act).to_html).to eq exp
+    end
+  end
+
+  context 'String-based single-word references' do
+    let(:label)     { create(:label, name: 'gfm', project: project) }
+    let(:reference) { "#{Label.reference_prefix}#{label.name}" }
+
+    it 'links to a valid reference' do
+      doc = filter("See #{reference}")
+
+      expect(doc.css('a').first.attr('href')).to eq urls.
+        namespace_project_issues_url(project.namespace, project, label_name: label.name)
+      expect(doc.text).to eq 'See gfm'
+    end
+
+    it 'links with adjacent text' do
+      doc = filter("Label (#{reference}.)")
+      expect(doc.to_html).to match(%r(\(<a.+><span.+>#{label.name}</span></a>\.\)))
+    end
+
+    it 'ignores invalid label names' do
+      exp = act = "Label #{Label.reference_prefix}#{label.name.reverse}"
+
+      expect(filter(act).to_html).to eq exp
+    end
+  end
+
+  context 'String-based multi-word references in quotes' do
+    let(:label)     { create(:label, name: 'gfm references', project: project) }
+    let(:reference) { label.to_reference(:name) }
+
+    it 'links to a valid reference' do
+      doc = filter("See #{reference}")
+
+      expect(doc.css('a').first.attr('href')).to eq urls.
+        namespace_project_issues_url(project.namespace, project, label_name: label.name)
+      expect(doc.text).to eq 'See gfm references'
+    end
+
+    it 'links with adjacent text' do
+      doc = filter("Label (#{reference}.)")
+      expect(doc.to_html).to match(%r(\(<a.+><span.+>#{label.name}</span></a>\.\)))
+    end
+
+    it 'ignores invalid label names' do
+      exp = act = %(Label #{Label.reference_prefix}"#{label.name.reverse}")
+
+      expect(filter(act).to_html).to eq exp
+    end
+  end
+
+  describe 'edge cases' do
+    it 'gracefully handles non-references matching the pattern' do
+      exp = act = '(format nil "~0f" 3.0) ; 3.0'
+      expect(filter(act).to_html).to eq exp
+    end
+  end
+end
diff --git a/spec/lib/gitlab/markdown/filter/merge_request_reference_filter_spec.rb b/spec/lib/gitlab/markdown/filter/merge_request_reference_filter_spec.rb
new file mode 100644
index 00000000000..a48b9634cc4
--- /dev/null
+++ b/spec/lib/gitlab/markdown/filter/merge_request_reference_filter_spec.rb
@@ -0,0 +1,118 @@
+require 'spec_helper'
+
+describe Gitlab::Markdown::MergeRequestReferenceFilter do
+  include FilterSpecHelper
+
+  let(:project) { create(:project, :public) }
+  let(:merge)   { create(:merge_request, source_project: project) }
+
+  it 'requires project context' do
+    expect { described_class.call('') }.to raise_error(ArgumentError, /:project/)
+  end
+
+  %w(pre code a style).each do |elem|
+    it "ignores valid references contained inside '#{elem}' element" do
+      exp = act = "<#{elem}>Merge #{merge.to_reference}</#{elem}>"
+      expect(filter(act).to_html).to eq exp
+    end
+  end
+
+  context 'internal reference' do
+    let(:reference) { merge.to_reference }
+
+    it 'links to a valid reference' do
+      doc = filter("See #{reference}")
+
+      expect(doc.css('a').first.attr('href')).to eq urls.
+        namespace_project_merge_request_url(project.namespace, project, merge)
+    end
+
+    it 'links with adjacent text' do
+      doc = filter("Merge (#{reference}.)")
+      expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
+    end
+
+    it 'ignores invalid merge IDs' do
+      exp = act = "Merge #{invalidate_reference(reference)}"
+
+      expect(filter(act).to_html).to eq exp
+    end
+
+    it 'includes a title attribute' do
+      doc = filter("Merge #{reference}")
+      expect(doc.css('a').first.attr('title')).to eq "Merge Request: #{merge.title}"
+    end
+
+    it 'escapes the title attribute' do
+      merge.update_attribute(:title, %{"></a>whatever<a title="})
+
+      doc = filter("Merge #{reference}")
+      expect(doc.text).to eq "Merge #{reference}"
+    end
+
+    it 'includes default classes' do
+      doc = filter("Merge #{reference}")
+      expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-merge_request'
+    end
+
+    it 'includes a data-project attribute' do
+      doc = filter("Merge #{reference}")
+      link = doc.css('a').first
+
+      expect(link).to have_attribute('data-project')
+      expect(link.attr('data-project')).to eq project.id.to_s
+    end
+
+    it 'includes a data-merge-request attribute' do
+      doc = filter("See #{reference}")
+      link = doc.css('a').first
+
+      expect(link).to have_attribute('data-merge-request')
+      expect(link.attr('data-merge-request')).to eq merge.id.to_s
+    end
+
+    it 'supports an :only_path context' do
+      doc = filter("Merge #{reference}", only_path: true)
+      link = doc.css('a').first.attr('href')
+
+      expect(link).not_to match %r(https?://)
+      expect(link).to eq urls.namespace_project_merge_request_url(project.namespace, project, merge, only_path: true)
+    end
+
+    it 'adds to the results hash' do
+      result = reference_pipeline_result("Merge #{reference}")
+      expect(result[:references][:merge_request]).to eq [merge]
+    end
+  end
+
+  context 'cross-project reference' do
+    let(:namespace) { create(:namespace, name: 'cross-reference') }
+    let(:project2)  { create(:project, :public, namespace: namespace) }
+    let(:merge)     { create(:merge_request, source_project: project2) }
+    let(:reference) { merge.to_reference(project) }
+
+    it 'links to a valid reference' do
+      doc = filter("See #{reference}")
+
+      expect(doc.css('a').first.attr('href')).
+        to eq urls.namespace_project_merge_request_url(project2.namespace,
+                                                      project, merge)
+    end
+
+    it 'links with adjacent text' do
+      doc = filter("Merge (#{reference}.)")
+      expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
+    end
+
+    it 'ignores invalid merge IDs on the referenced project' do
+      exp = act = "Merge #{invalidate_reference(reference)}"
+
+      expect(filter(act).to_html).to eq exp
+    end
+
+    it 'adds to the results hash' do
+      result = reference_pipeline_result("Merge #{reference}")
+      expect(result[:references][:merge_request]).to eq [merge]
+    end
+  end
+end
diff --git a/spec/lib/gitlab/markdown/filter/redactor_filter_spec.rb b/spec/lib/gitlab/markdown/filter/redactor_filter_spec.rb
new file mode 100644
index 00000000000..c177d6950a0
--- /dev/null
+++ b/spec/lib/gitlab/markdown/filter/redactor_filter_spec.rb
@@ -0,0 +1,89 @@
+require 'spec_helper'
+
+describe Gitlab::Markdown::RedactorFilter do
+  include ActionView::Helpers::UrlHelper
+  include FilterSpecHelper
+
+  it 'ignores non-GFM links' do
+    html = %(See <a href="https://google.com/">Google</a>)
+    doc = filter(html, current_user: double)
+
+    expect(doc.css('a').length).to eq 1
+  end
+
+  def reference_link(data)
+    link_to('text', '', class: 'gfm', data: data)
+  end
+
+  context 'with data-project' do
+    it 'removes unpermitted Project references' do
+      user = create(:user)
+      project = create(:empty_project)
+
+      link = reference_link(project: project.id, reference_filter: Gitlab::Markdown::ReferenceFilter.name)
+      doc = filter(link, current_user: user)
+
+      expect(doc.css('a').length).to eq 0
+    end
+
+    it 'allows permitted Project references' do
+      user = create(:user)
+      project = create(:empty_project)
+      project.team << [user, :master]
+
+      link = reference_link(project: project.id, reference_filter: Gitlab::Markdown::ReferenceFilter.name)
+      doc = filter(link, current_user: user)
+
+      expect(doc.css('a').length).to eq 1
+    end
+
+    it 'handles invalid Project references' do
+      link = reference_link(project: 12345, reference_filter: Gitlab::Markdown::ReferenceFilter.name)
+
+      expect { filter(link) }.not_to raise_error
+    end
+  end
+
+  context "for user references" do
+
+    context 'with data-group' do
+      it 'removes unpermitted Group references' do
+        user = create(:user)
+        group = create(:group)
+
+        link = reference_link(group: group.id, reference_filter: Gitlab::Markdown::UserReferenceFilter.name)
+        doc = filter(link, current_user: user)
+
+        expect(doc.css('a').length).to eq 0
+      end
+
+      it 'allows permitted Group references' do
+        user = create(:user)
+        group = create(:group)
+        group.add_developer(user)
+
+        link = reference_link(group: group.id, reference_filter: Gitlab::Markdown::UserReferenceFilter.name)
+        doc = filter(link, current_user: user)
+
+        expect(doc.css('a').length).to eq 1
+      end
+
+      it 'handles invalid Group references' do
+        link = reference_link(group: 12345, reference_filter: Gitlab::Markdown::UserReferenceFilter.name)
+
+        expect { filter(link) }.not_to raise_error
+      end
+    end
+
+    context 'with data-user' do
+      it 'allows any User reference' do
+        user = create(:user)
+
+        link = reference_link(user: user.id, reference_filter: Gitlab::Markdown::UserReferenceFilter.name)
+        doc = filter(link)
+
+        expect(doc.css('a').length).to eq 1
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/markdown/filter/reference_gatherer_filter_spec.rb b/spec/lib/gitlab/markdown/filter/reference_gatherer_filter_spec.rb
new file mode 100644
index 00000000000..0884f53abe5
--- /dev/null
+++ b/spec/lib/gitlab/markdown/filter/reference_gatherer_filter_spec.rb
@@ -0,0 +1,87 @@
+require 'spec_helper'
+
+describe Gitlab::Markdown::ReferenceGathererFilter do
+  include ActionView::Helpers::UrlHelper
+  include FilterSpecHelper
+
+  def reference_link(data)
+    link_to('text', '', class: 'gfm', data: data)
+  end
+
+  context "for issue references" do
+
+    context 'with data-project' do
+      it 'removes unpermitted Project references' do
+        user = create(:user)
+        project = create(:empty_project)
+        issue = create(:issue, project: project)
+
+        link = reference_link(project: project.id, issue: issue.id, reference_filter: Gitlab::Markdown::IssueReferenceFilter.name)
+        result = pipeline_result(link, current_user: user)
+
+        expect(result[:references][:issue]).to be_empty
+      end
+
+      it 'allows permitted Project references' do
+        user = create(:user)
+        project = create(:empty_project)
+        issue = create(:issue, project: project)
+        project.team << [user, :master]
+
+        link = reference_link(project: project.id, issue: issue.id, reference_filter: Gitlab::Markdown::IssueReferenceFilter.name)
+        result = pipeline_result(link, current_user: user)
+
+        expect(result[:references][:issue]).to eq([issue])
+      end
+
+      it 'handles invalid Project references' do
+        link = reference_link(project: 12345, issue: 12345, reference_filter: Gitlab::Markdown::IssueReferenceFilter.name)
+
+        expect { pipeline_result(link) }.not_to raise_error
+      end
+    end
+  end
+
+  context "for user references" do
+
+    context 'with data-group' do
+      it 'removes unpermitted Group references' do
+        user = create(:user)
+        group = create(:group)
+
+        link = reference_link(group: group.id, reference_filter: Gitlab::Markdown::UserReferenceFilter.name)
+        result = pipeline_result(link, current_user: user)
+
+        expect(result[:references][:user]).to be_empty
+      end
+
+      it 'allows permitted Group references' do
+        user = create(:user)
+        group = create(:group)
+        group.add_developer(user)
+
+        link = reference_link(group: group.id, reference_filter: Gitlab::Markdown::UserReferenceFilter.name)
+        result = pipeline_result(link, current_user: user)
+
+        expect(result[:references][:user]).to eq([user])
+      end
+
+      it 'handles invalid Group references' do
+        link = reference_link(group: 12345, reference_filter: Gitlab::Markdown::UserReferenceFilter.name)
+
+        expect { pipeline_result(link) }.not_to raise_error
+      end
+    end
+
+    context 'with data-user' do
+      it 'allows any User reference' do
+        user = create(:user)
+
+        link = reference_link(user: user.id, reference_filter: Gitlab::Markdown::UserReferenceFilter.name)
+        result = pipeline_result(link)
+
+        expect(result[:references][:user]).to eq([user])
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/markdown/filter/relative_link_filter_spec.rb b/spec/lib/gitlab/markdown/filter/relative_link_filter_spec.rb
new file mode 100644
index 00000000000..3d978505564
--- /dev/null
+++ b/spec/lib/gitlab/markdown/filter/relative_link_filter_spec.rb
@@ -0,0 +1,147 @@
+# encoding: UTF-8
+
+require 'spec_helper'
+
+describe Gitlab::Markdown::RelativeLinkFilter do
+  def filter(doc, contexts = {})
+    contexts.reverse_merge!({
+      commit:         project.commit,
+      project:        project,
+      project_wiki:   project_wiki,
+      ref:            ref,
+      requested_path: requested_path
+    })
+
+    described_class.call(doc, contexts)
+  end
+
+  def image(path)
+    %(<img src="#{path}" />)
+  end
+
+  def link(path)
+    %(<a href="#{path}">#{path}</a>)
+  end
+
+  let(:project)        { create(:project) }
+  let(:project_path)   { project.path_with_namespace }
+  let(:ref)            { 'markdown' }
+  let(:project_wiki)   { nil }
+  let(:requested_path) { '/' }
+
+  shared_examples :preserve_unchanged do
+    it 'does not modify any relative URL in anchor' do
+      doc = filter(link('README.md'))
+      expect(doc.at_css('a')['href']).to eq 'README.md'
+    end
+
+    it 'does not modify any relative URL in image' do
+      doc = filter(image('files/images/logo-black.png'))
+      expect(doc.at_css('img')['src']).to eq 'files/images/logo-black.png'
+    end
+  end
+
+  shared_examples :relative_to_requested do
+    it 'rebuilds URL relative to the requested path' do
+      doc = filter(link('users.md'))
+      expect(doc.at_css('a')['href']).
+        to eq "/#{project_path}/blob/#{ref}/doc/api/users.md"
+    end
+  end
+
+  context 'with a project_wiki' do
+    let(:project_wiki) { double('ProjectWiki') }
+    include_examples :preserve_unchanged
+  end
+
+  context 'without a repository' do
+    let(:project) { create(:empty_project) }
+    include_examples :preserve_unchanged
+  end
+
+  context 'with an empty repository' do
+    let(:project) { create(:project_empty_repo) }
+    include_examples :preserve_unchanged
+  end
+
+  it 'does not raise an exception on invalid URIs' do
+    act = link("://foo")
+    expect { filter(act) }.not_to raise_error
+  end
+
+  context 'with a valid repository' do
+    it 'rebuilds relative URL for a file in the repo' do
+      doc = filter(link('doc/api/README.md'))
+      expect(doc.at_css('a')['href']).
+        to eq "/#{project_path}/blob/#{ref}/doc/api/README.md"
+    end
+
+    it 'rebuilds relative URL for a file in the repo up one directory' do
+      relative_link = link('../api/README.md')
+      doc = filter(relative_link, requested_path: 'doc/update/7.14-to-8.0.md')
+
+      expect(doc.at_css('a')['href']).
+        to eq "/#{project_path}/blob/#{ref}/doc/api/README.md"
+    end
+
+    it 'rebuilds relative URL for a file in the repo up multiple directories' do
+      relative_link = link('../../../api/README.md')
+      doc = filter(relative_link, requested_path: 'doc/foo/bar/baz/README.md')
+
+      expect(doc.at_css('a')['href']).
+        to eq "/#{project_path}/blob/#{ref}/doc/api/README.md"
+    end
+
+    it 'rebuilds relative URL for a file in the repo with an anchor' do
+      doc = filter(link('README.md#section'))
+      expect(doc.at_css('a')['href']).
+        to eq "/#{project_path}/blob/#{ref}/README.md#section"
+    end
+
+    it 'rebuilds relative URL for a directory in the repo' do
+      doc = filter(link('doc/api/'))
+      expect(doc.at_css('a')['href']).
+        to eq "/#{project_path}/tree/#{ref}/doc/api"
+    end
+
+    it 'rebuilds relative URL for an image in the repo' do
+      doc = filter(link('files/images/logo-black.png'))
+      expect(doc.at_css('a')['href']).
+        to eq "/#{project_path}/raw/#{ref}/files/images/logo-black.png"
+    end
+
+    it 'does not modify relative URL with an anchor only' do
+      doc = filter(link('#section-1'))
+      expect(doc.at_css('a')['href']).to eq '#section-1'
+    end
+
+    it 'does not modify absolute URL' do
+      doc = filter(link('http://example.com'))
+      expect(doc.at_css('a')['href']).to eq 'http://example.com'
+    end
+
+    it 'supports Unicode filenames' do
+      path = 'files/images/한글.png'
+      escaped = Addressable::URI.escape(path)
+
+      # Stub these methods so the file doesn't actually need to be in the repo
+      allow_any_instance_of(described_class).
+        to receive(:file_exists?).and_return(true)
+      allow_any_instance_of(described_class).
+        to receive(:image?).with(path).and_return(true)
+
+      doc = filter(image(escaped))
+      expect(doc.at_css('img')['src']).to match '/raw/'
+    end
+
+    context 'when requested path is a file in the repo' do
+      let(:requested_path) { 'doc/api/README.md' }
+      include_examples :relative_to_requested
+    end
+
+    context 'when requested path is a directory in the repo' do
+      let(:requested_path) { 'doc/api' }
+      include_examples :relative_to_requested
+    end
+  end
+end
diff --git a/spec/lib/gitlab/markdown/filter/sanitization_filter_spec.rb b/spec/lib/gitlab/markdown/filter/sanitization_filter_spec.rb
new file mode 100644
index 00000000000..33d850d0dd3
--- /dev/null
+++ b/spec/lib/gitlab/markdown/filter/sanitization_filter_spec.rb
@@ -0,0 +1,197 @@
+require 'spec_helper'
+
+describe Gitlab::Markdown::SanitizationFilter do
+  include FilterSpecHelper
+
+  describe 'default whitelist' do
+    it 'sanitizes tags that are not whitelisted' do
+      act = %q{<textarea>no inputs</textarea> and <blink>no blinks</blink>}
+      exp = 'no inputs and no blinks'
+      expect(filter(act).to_html).to eq exp
+    end
+
+    it 'sanitizes tag attributes' do
+      act = %q{<a href="http://example.com/bar.html" onclick="bar">Text</a>}
+      exp = %q{<a href="http://example.com/bar.html">Text</a>}
+      expect(filter(act).to_html).to eq exp
+    end
+
+    it 'sanitizes javascript in attributes' do
+      act = %q(<a href="javascript:alert('foo')">Text</a>)
+      exp = '<a>Text</a>'
+      expect(filter(act).to_html).to eq exp
+    end
+
+    it 'allows whitelisted HTML tags from the user' do
+      exp = act = "<dl>\n<dt>Term</dt>\n<dd>Definition</dd>\n</dl>"
+      expect(filter(act).to_html).to eq exp
+    end
+
+    it 'sanitizes `class` attribute on any element' do
+      act = %q{<strong class="foo">Strong</strong>}
+      expect(filter(act).to_html).to eq %q{<strong>Strong</strong>}
+    end
+
+    it 'sanitizes `id` attribute on any element' do
+      act = %q{<em id="foo">Emphasis</em>}
+      expect(filter(act).to_html).to eq %q{<em>Emphasis</em>}
+    end
+  end
+
+  describe 'custom whitelist' do
+    it 'customizes the whitelist only once' do
+      instance = described_class.new('Foo')
+      3.times { instance.whitelist }
+
+      expect(instance.whitelist[:transformers].size).to eq 5
+    end
+
+    it 'allows syntax highlighting' do
+      exp = act = %q{<pre class="code highlight white c"><code><span class="k">def</span></code></pre>}
+      expect(filter(act).to_html).to eq exp
+    end
+
+    it 'sanitizes `class` attribute from non-highlight spans' do
+      act = %q{<span class="k">def</span>}
+      expect(filter(act).to_html).to eq %q{<span>def</span>}
+    end
+
+    it 'allows `style` attribute on table elements' do
+      html = <<-HTML.strip_heredoc
+      <table>
+        <tr><th style="text-align: center">Head</th></tr>
+        <tr><td style="text-align: right">Body</th></tr>
+      </table>
+      HTML
+
+      doc = filter(html)
+
+      expect(doc.at_css('th')['style']).to eq 'text-align: center'
+      expect(doc.at_css('td')['style']).to eq 'text-align: right'
+    end
+
+    it 'allows `span` elements' do
+      exp = act = %q{<span>Hello</span>}
+      expect(filter(act).to_html).to eq exp
+    end
+
+    it 'removes `rel` attribute from `a` elements' do
+      act = %q{<a href="#" rel="nofollow">Link</a>}
+      exp = %q{<a href="#">Link</a>}
+
+      expect(filter(act).to_html).to eq exp
+    end
+
+    # Adapted from the Sanitize test suite: http://git.io/vczrM
+    protocols = {
+      'protocol-based JS injection: simple, no spaces' => {
+        input:  '<a href="javascript:alert(\'XSS\');">foo</a>',
+        output: '<a>foo</a>'
+      },
+
+      'protocol-based JS injection: simple, spaces before' => {
+        input:  '<a href="javascript    :alert(\'XSS\');">foo</a>',
+        output: '<a>foo</a>'
+      },
+
+      'protocol-based JS injection: simple, spaces after' => {
+        input:  '<a href="javascript:    alert(\'XSS\');">foo</a>',
+        output: '<a>foo</a>'
+      },
+
+      'protocol-based JS injection: simple, spaces before and after' => {
+        input:  '<a href="javascript    :   alert(\'XSS\');">foo</a>',
+        output: '<a>foo</a>'
+      },
+
+      'protocol-based JS injection: preceding colon' => {
+        input:  '<a href=":javascript:alert(\'XSS\');">foo</a>',
+        output: '<a>foo</a>'
+      },
+
+      'protocol-based JS injection: UTF-8 encoding' => {
+        input:  '<a href="javascript&#58;">foo</a>',
+        output: '<a>foo</a>'
+      },
+
+      'protocol-based JS injection: long UTF-8 encoding' => {
+        input:  '<a href="javascript&#0058;">foo</a>',
+        output: '<a>foo</a>'
+      },
+
+      'protocol-based JS injection: long UTF-8 encoding without semicolons' => {
+        input:  '<a href=&#0000106&#0000097&#0000118&#0000097&#0000115&#0000099&#0000114&#0000105&#0000112&#0000116&#0000058&#0000097&#0000108&#0000101&#0000114&#0000116&#0000040&#0000039&#0000088&#0000083&#0000083&#0000039&#0000041>foo</a>',
+        output: '<a>foo</a>'
+      },
+
+      'protocol-based JS injection: hex encoding' => {
+        input:  '<a href="javascript&#x3A;">foo</a>',
+        output: '<a>foo</a>'
+      },
+
+      'protocol-based JS injection: long hex encoding' => {
+        input:  '<a href="javascript&#x003A;">foo</a>',
+        output: '<a>foo</a>'
+      },
+
+      'protocol-based JS injection: hex encoding without semicolons' => {
+        input:  '<a href=&#x6A&#x61&#x76&#x61&#x73&#x63&#x72&#x69&#x70&#x74&#x3A&#x61&#x6C&#x65&#x72&#x74&#x28&#x27&#x58&#x53&#x53&#x27&#x29>foo</a>',
+        output: '<a>foo</a>'
+      },
+
+      'protocol-based JS injection: null char' => {
+        input:  "<a href=java\0script:alert(\"XSS\")>foo</a>",
+        output: '<a href="java"></a>'
+      },
+
+      'protocol-based JS injection: spaces and entities' => {
+        input:  '<a href=" &#14;  javascript:alert(\'XSS\');">foo</a>',
+        output: '<a href="">foo</a>'
+      },
+    }
+
+    protocols.each do |name, data|
+      it "handles #{name}" do
+        doc = filter(data[:input])
+
+        expect(doc.to_html).to eq data[:output]
+      end
+    end
+
+    it 'allows non-standard anchor schemes' do
+      exp = %q{<a href="irc://irc.freenode.net/git">IRC</a>}
+      act = filter(exp)
+
+      expect(act.to_html).to eq exp
+    end
+
+    it 'allows relative links' do
+      exp = %q{<a href="foo/bar.md">foo/bar.md</a>}
+      act = filter(exp)
+
+      expect(act.to_html).to eq exp
+    end
+  end
+
+  context 'when inline_sanitization is true' do
+    it 'uses a stricter whitelist' do
+      doc = filter('<h1>Description</h1>', inline_sanitization: true)
+      expect(doc.to_html.strip).to eq 'Description'
+    end
+
+    %w(pre code img ol ul li).each do |elem|
+      it "removes '#{elem}' elements" do
+        act = "<#{elem}>Description</#{elem}>"
+        expect(filter(act, inline_sanitization: true).to_html.strip).
+          to eq 'Description'
+      end
+    end
+
+    %w(b i strong em a ins del sup sub p).each do |elem|
+      it "still allows '#{elem}' elements" do
+        exp = act = "<#{elem}>Description</#{elem}>"
+        expect(filter(act, inline_sanitization: true).to_html).to eq exp
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/markdown/filter/snippet_reference_filter_spec.rb b/spec/lib/gitlab/markdown/filter/snippet_reference_filter_spec.rb
new file mode 100644
index 00000000000..671aac49598
--- /dev/null
+++ b/spec/lib/gitlab/markdown/filter/snippet_reference_filter_spec.rb
@@ -0,0 +1,116 @@
+require 'spec_helper'
+
+describe Gitlab::Markdown::SnippetReferenceFilter do
+  include FilterSpecHelper
+
+  let(:project)   { create(:empty_project, :public) }
+  let(:snippet)   { create(:project_snippet, project: project) }
+  let(:reference) { snippet.to_reference }
+
+  it 'requires project context' do
+    expect { described_class.call('') }.to raise_error(ArgumentError, /:project/)
+  end
+
+  %w(pre code a style).each do |elem|
+    it "ignores valid references contained inside '#{elem}' element" do
+      exp = act = "<#{elem}>Snippet #{reference}</#{elem}>"
+      expect(filter(act).to_html).to eq exp
+    end
+  end
+
+  context 'internal reference' do
+    it 'links to a valid reference' do
+      doc = filter("See #{reference}")
+
+      expect(doc.css('a').first.attr('href')).to eq urls.
+        namespace_project_snippet_url(project.namespace, project, snippet)
+    end
+
+    it 'links with adjacent text' do
+      doc = filter("Snippet (#{reference}.)")
+      expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
+    end
+
+    it 'ignores invalid snippet IDs' do
+      exp = act = "Snippet #{invalidate_reference(reference)}"
+
+      expect(filter(act).to_html).to eq exp
+    end
+
+    it 'includes a title attribute' do
+      doc = filter("Snippet #{reference}")
+      expect(doc.css('a').first.attr('title')).to eq "Snippet: #{snippet.title}"
+    end
+
+    it 'escapes the title attribute' do
+      snippet.update_attribute(:title, %{"></a>whatever<a title="})
+
+      doc = filter("Snippet #{reference}")
+      expect(doc.text).to eq "Snippet #{reference}"
+    end
+
+    it 'includes default classes' do
+      doc = filter("Snippet #{reference}")
+      expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-snippet'
+    end
+
+    it 'includes a data-project attribute' do
+      doc = filter("Snippet #{reference}")
+      link = doc.css('a').first
+
+      expect(link).to have_attribute('data-project')
+      expect(link.attr('data-project')).to eq project.id.to_s
+    end
+
+    it 'includes a data-snippet attribute' do
+      doc = filter("See #{reference}")
+      link = doc.css('a').first
+
+      expect(link).to have_attribute('data-snippet')
+      expect(link.attr('data-snippet')).to eq snippet.id.to_s
+    end
+
+    it 'supports an :only_path context' do
+      doc = filter("Snippet #{reference}", only_path: true)
+      link = doc.css('a').first.attr('href')
+
+      expect(link).not_to match %r(https?://)
+      expect(link).to eq urls.namespace_project_snippet_url(project.namespace, project, snippet, only_path: true)
+    end
+
+    it 'adds to the results hash' do
+      result = reference_pipeline_result("Snippet #{reference}")
+      expect(result[:references][:snippet]).to eq [snippet]
+    end
+  end
+
+  context 'cross-project reference' do
+    let(:namespace) { create(:namespace, name: 'cross-reference') }
+    let(:project2)  { create(:empty_project, :public, namespace: namespace) }
+    let(:snippet)   { create(:project_snippet, project: project2) }
+    let(:reference) { snippet.to_reference(project) }
+
+    it 'links to a valid reference' do
+      doc = filter("See #{reference}")
+
+      expect(doc.css('a').first.attr('href')).
+        to eq urls.namespace_project_snippet_url(project2.namespace, project2, snippet)
+    end
+
+    it 'links with adjacent text' do
+      doc = filter("See (#{reference}.)")
+      expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
+    end
+
+    it 'ignores invalid snippet IDs on the referenced project' do
+      exp = act = "See #{invalidate_reference(reference)}"
+
+      expect(filter(act).to_html).to eq exp
+    end
+
+    it 'adds to the results hash' do
+      result = reference_pipeline_result("Snippet #{reference}")
+      expect(result[:references][:snippet]).to eq [snippet]
+    end
+  end
+end
diff --git a/spec/lib/gitlab/markdown/filter/syntax_highlight_filter_spec.rb b/spec/lib/gitlab/markdown/filter/syntax_highlight_filter_spec.rb
new file mode 100644
index 00000000000..2df81282fa2
--- /dev/null
+++ b/spec/lib/gitlab/markdown/filter/syntax_highlight_filter_spec.rb
@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe Gitlab::Markdown::SyntaxHighlightFilter do
+  include FilterSpecHelper
+
+  it 'highlights valid code blocks' do
+    result = filter('<pre><code>def fun end</code>')
+    expect(result.to_html).to eq("<pre class=\"code highlight js-syntax-highlight plaintext\"><code>def fun end</code></pre>\n")
+  end
+
+  it 'passes through invalid code blocks' do
+    allow_any_instance_of(described_class).to receive(:block_code).and_raise(StandardError)
+
+    result = filter('<pre><code>This is a test</code></pre>')
+    expect(result.to_html).to eq('<pre>This is a test</pre>')
+  end
+end
diff --git a/spec/lib/gitlab/markdown/filter/table_of_contents_filter_spec.rb b/spec/lib/gitlab/markdown/filter/table_of_contents_filter_spec.rb
new file mode 100644
index 00000000000..3aba29f0f27
--- /dev/null
+++ b/spec/lib/gitlab/markdown/filter/table_of_contents_filter_spec.rb
@@ -0,0 +1,97 @@
+# encoding: UTF-8
+
+require 'spec_helper'
+
+describe Gitlab::Markdown::TableOfContentsFilter do
+  include FilterSpecHelper
+
+  def header(level, text)
+    "<h#{level}>#{text}</h#{level}>\n"
+  end
+
+  it 'does nothing when :no_header_anchors is truthy' do
+    exp = act = header(1, 'Header')
+    expect(filter(act, no_header_anchors: 1).to_html).to eq exp
+  end
+
+  it 'does nothing with empty headers' do
+    exp = act = header(1, nil)
+    expect(filter(act).to_html).to eq exp
+  end
+
+  1.upto(6) do |i|
+    it "processes h#{i} elements" do
+      html = header(i, "Header #{i}")
+      doc = filter(html)
+
+      expect(doc.css("h#{i} a").first.attr('id')).to eq "header-#{i}"
+    end
+  end
+
+  describe 'anchor tag' do
+    it 'has an `anchor` class' do
+      doc = filter(header(1, 'Header'))
+      expect(doc.css('h1 a').first.attr('class')).to eq 'anchor'
+    end
+
+    it 'links to the id' do
+      doc = filter(header(1, 'Header'))
+      expect(doc.css('h1 a').first.attr('href')).to eq '#header'
+    end
+
+    describe 'generated IDs' do
+      it 'translates spaces to dashes' do
+        doc = filter(header(1, 'This header has spaces in it'))
+        expect(doc.css('h1 a').first.attr('id')).to eq 'this-header-has-spaces-in-it'
+      end
+
+      it 'squeezes multiple spaces and dashes' do
+        doc = filter(header(1, 'This---header     is poorly-formatted'))
+        expect(doc.css('h1 a').first.attr('id')).to eq 'this-header-is-poorly-formatted'
+      end
+
+      it 'removes punctuation' do
+        doc = filter(header(1, "This, header! is, filled. with @ punctuation?"))
+        expect(doc.css('h1 a').first.attr('id')).to eq 'this-header-is-filled-with-punctuation'
+      end
+
+      it 'appends a unique number to duplicates' do
+        doc = filter(header(1, 'One') + header(2, 'One'))
+
+        expect(doc.css('h1 a').first.attr('id')).to eq 'one'
+        expect(doc.css('h2 a').first.attr('id')).to eq 'one-1'
+      end
+
+      it 'supports Unicode' do
+        doc = filter(header(1, '한글'))
+        expect(doc.css('h1 a').first.attr('id')).to eq '한글'
+        expect(doc.css('h1 a').first.attr('href')).to eq '#한글'
+      end
+    end
+  end
+
+  describe 'result' do
+    def result(html)
+      HTML::Pipeline.new([described_class]).call(html)
+    end
+
+    let(:results) { result(header(1, 'Header 1') + header(2, 'Header 2')) }
+    let(:doc) { Nokogiri::XML::DocumentFragment.parse(results[:toc]) }
+
+    it 'is contained within a `ul` element' do
+      expect(doc.children.first.name).to eq 'ul'
+      expect(doc.children.first.attr('class')).to eq 'section-nav'
+    end
+
+    it 'contains an `li` element for each header' do
+      expect(doc.css('li').length).to eq 2
+
+      links = doc.css('li a')
+
+      expect(links.first.attr('href')).to eq '#header-1'
+      expect(links.first.text).to eq 'Header 1'
+      expect(links.last.attr('href')).to eq '#header-2'
+      expect(links.last.text).to eq 'Header 2'
+    end
+  end
+end
diff --git a/spec/lib/gitlab/markdown/filter/task_list_filter_spec.rb b/spec/lib/gitlab/markdown/filter/task_list_filter_spec.rb
new file mode 100644
index 00000000000..8b205adbbc4
--- /dev/null
+++ b/spec/lib/gitlab/markdown/filter/task_list_filter_spec.rb
@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe Gitlab::Markdown::TaskListFilter do
+  include FilterSpecHelper
+
+  it 'does not apply `task-list` class to non-task lists' do
+    exp = act = %(<ul><li>Item</li></ul>)
+    expect(filter(act).to_html).to eq exp
+  end
+end
diff --git a/spec/lib/gitlab/markdown/filter/upload_link_filter_spec.rb b/spec/lib/gitlab/markdown/filter/upload_link_filter_spec.rb
new file mode 100644
index 00000000000..aec22ee4168
--- /dev/null
+++ b/spec/lib/gitlab/markdown/filter/upload_link_filter_spec.rb
@@ -0,0 +1,73 @@
+# encoding: UTF-8
+
+require 'spec_helper'
+
+describe Gitlab::Markdown::UploadLinkFilter do
+  def filter(doc, contexts = {})
+    contexts.reverse_merge!({
+      project: project
+    })
+
+    described_class.call(doc, contexts)
+  end
+
+  def image(path)
+    %(<img src="#{path}" />)
+  end
+
+  def link(path)
+    %(<a href="#{path}">#{path}</a>)
+  end
+
+  let(:project) { create(:project) }
+
+  shared_examples :preserve_unchanged do
+    it 'does not modify any relative URL in anchor' do
+      doc = filter(link('README.md'))
+      expect(doc.at_css('a')['href']).to eq 'README.md'
+    end
+
+    it 'does not modify any relative URL in image' do
+      doc = filter(image('files/images/logo-black.png'))
+      expect(doc.at_css('img')['src']).to eq 'files/images/logo-black.png'
+    end
+  end
+
+  it 'does not raise an exception on invalid URIs' do
+    act = link("://foo")
+    expect { filter(act) }.not_to raise_error
+  end
+
+  context 'with a valid repository' do
+    it 'rebuilds relative URL for a link' do
+      doc = filter(link('/uploads/e90decf88d8f96fe9e1389afc2e4a91f/test.jpg'))
+      expect(doc.at_css('a')['href']).
+        to eq "#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}/uploads/e90decf88d8f96fe9e1389afc2e4a91f/test.jpg"
+    end
+
+    it 'rebuilds relative URL for an image' do
+      doc = filter(link('/uploads/e90decf88d8f96fe9e1389afc2e4a91f/test.jpg'))
+      expect(doc.at_css('a')['href']).
+        to eq "#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}/uploads/e90decf88d8f96fe9e1389afc2e4a91f/test.jpg"
+    end
+
+    it 'does not modify absolute URL' do
+      doc = filter(link('http://example.com'))
+      expect(doc.at_css('a')['href']).to eq 'http://example.com'
+    end
+
+    it 'supports Unicode filenames' do
+      path = '/uploads/한글.png'
+      escaped = Addressable::URI.escape(path)
+
+      # Stub these methods so the file doesn't actually need to be in the repo
+      allow_any_instance_of(described_class).
+        to receive(:file_exists?).and_return(true)
+      allow_any_instance_of(described_class).
+        to receive(:image?).with(path).and_return(true)
+
+      doc = filter(image(escaped))
+      expect(doc.at_css('img')['src']).to match "#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}/uploads/%ED%95%9C%EA%B8%80.png"
+    end
+  end
+end
diff --git a/spec/lib/gitlab/markdown/filter/user_reference_filter_spec.rb b/spec/lib/gitlab/markdown/filter/user_reference_filter_spec.rb
new file mode 100644
index 00000000000..8ccd7744d6c
--- /dev/null
+++ b/spec/lib/gitlab/markdown/filter/user_reference_filter_spec.rb
@@ -0,0 +1,120 @@
+require 'spec_helper'
+
+describe Gitlab::Markdown::UserReferenceFilter do
+  include FilterSpecHelper
+
+  let(:project)   { create(:empty_project, :public) }
+  let(:user)      { create(:user) }
+  let(:reference) { user.to_reference }
+
+  it 'requires project context' do
+    expect { described_class.call('') }.to raise_error(ArgumentError, /:project/)
+  end
+
+  it 'ignores invalid users' do
+    exp = act = "Hey #{invalidate_reference(reference)}"
+    expect(filter(act).to_html).to eq(exp)
+  end
+
+  %w(pre code a style).each do |elem|
+    it "ignores valid references contained inside '#{elem}' element" do
+      exp = act = "<#{elem}>Hey #{reference}</#{elem}>"
+      expect(filter(act).to_html).to eq exp
+    end
+  end
+
+  context 'mentioning @all' do
+    let(:reference) { User.reference_prefix + 'all' }
+
+    before do
+      project.team << [project.creator, :developer]
+    end
+
+    it 'supports a special @all mention' do
+      doc = filter("Hey #{reference}")
+      expect(doc.css('a').length).to eq 1
+      expect(doc.css('a').first.attr('href'))
+        .to eq urls.namespace_project_url(project.namespace, project)
+    end
+
+    it 'adds to the results hash' do
+      result = reference_pipeline_result("Hey #{reference}")
+      expect(result[:references][:user]).to eq [project.creator]
+    end
+  end
+
+  context 'mentioning a user' do
+    it 'links to a User' do
+      doc = filter("Hey #{reference}")
+      expect(doc.css('a').first.attr('href')).to eq urls.user_url(user)
+    end
+
+    it 'links to a User with a period' do
+      user = create(:user, name: 'alphA.Beta')
+
+      doc = filter("Hey #{user.to_reference}")
+      expect(doc.css('a').length).to eq 1
+    end
+
+    it 'links to a User with an underscore' do
+      user = create(:user, name: 'ping_pong_king')
+
+      doc = filter("Hey #{user.to_reference}")
+      expect(doc.css('a').length).to eq 1
+    end
+
+    it 'includes a data-user attribute' do
+      doc = filter("Hey #{reference}")
+      link = doc.css('a').first
+
+      expect(link).to have_attribute('data-user')
+      expect(link.attr('data-user')).to eq user.namespace.owner_id.to_s
+    end
+
+    it 'adds to the results hash' do
+      result = reference_pipeline_result("Hey #{reference}")
+      expect(result[:references][:user]).to eq [user]
+    end
+  end
+
+  context 'mentioning a group' do
+    let(:group)     { create(:group) }
+    let(:reference) { group.to_reference }
+
+    it 'links to the Group' do
+      doc = filter("Hey #{reference}")
+      expect(doc.css('a').first.attr('href')).to eq urls.group_url(group)
+    end
+
+    it 'includes a data-group attribute' do
+      doc = filter("Hey #{reference}")
+      link = doc.css('a').first
+
+      expect(link).to have_attribute('data-group')
+      expect(link.attr('data-group')).to eq group.id.to_s
+    end
+
+    it 'adds to the results hash' do
+      result = reference_pipeline_result("Hey #{reference}")
+      expect(result[:references][:user]).to eq group.users
+    end
+  end
+
+  it 'links with adjacent text' do
+    doc = filter("Mention me (#{reference}.)")
+    expect(doc.to_html).to match(/\(<a.+>#{reference}<\/a>\.\)/)
+  end
+
+  it 'includes default classes' do
+    doc = filter("Hey #{reference}")
+    expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-project_member'
+  end
+
+  it 'supports an :only_path context' do
+    doc = filter("Hey #{reference}", only_path: true)
+    link = doc.css('a').first.attr('href')
+
+    expect(link).not_to match %r(https?://)
+    expect(link).to eq urls.user_path(user)
+  end
+end
diff --git a/spec/lib/gitlab/markdown/issue_reference_filter_spec.rb b/spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
deleted file mode 100644
index 94c80ae6611..00000000000
--- a/spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
+++ /dev/null
@@ -1,139 +0,0 @@
-require 'spec_helper'
-
-module Gitlab::Markdown
-  describe IssueReferenceFilter do
-    include FilterSpecHelper
-
-    def helper
-      IssuesHelper
-    end
-
-    let(:project) { create(:empty_project, :public) }
-    let(:issue)   { create(:issue, project: project) }
-
-    it 'requires project context' do
-      expect { described_class.call('') }.to raise_error(ArgumentError, /:project/)
-    end
-
-    %w(pre code a style).each do |elem|
-      it "ignores valid references contained inside '#{elem}' element" do
-        exp = act = "<#{elem}>Issue #{issue.to_reference}</#{elem}>"
-        expect(filter(act).to_html).to eq exp
-      end
-    end
-
-    context 'internal reference' do
-      let(:reference) { issue.to_reference }
-
-      it 'ignores valid references when using non-default tracker' do
-        expect(project).to receive(:get_issue).with(issue.iid).and_return(nil)
-
-        exp = act = "Issue #{reference}"
-        expect(filter(act).to_html).to eq exp
-      end
-
-      it 'links to a valid reference' do
-        doc = filter("Fixed #{reference}")
-
-        expect(doc.css('a').first.attr('href')).
-          to eq helper.url_for_issue(issue.iid, project)
-      end
-
-      it 'links with adjacent text' do
-        doc = filter("Fixed (#{reference}.)")
-        expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
-      end
-
-      it 'ignores invalid issue IDs' do
-        invalid = invalidate_reference(reference)
-        exp = act = "Fixed #{invalid}"
-
-        expect(filter(act).to_html).to eq exp
-      end
-
-      it 'includes a title attribute' do
-        doc = filter("Issue #{reference}")
-        expect(doc.css('a').first.attr('title')).to eq "Issue: #{issue.title}"
-      end
-
-      it 'escapes the title attribute' do
-        issue.update_attribute(:title, %{"></a>whatever<a title="})
-
-        doc = filter("Issue #{reference}")
-        expect(doc.text).to eq "Issue #{reference}"
-      end
-
-      it 'includes default classes' do
-        doc = filter("Issue #{reference}")
-        expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-issue'
-      end
-
-      it 'includes a data-project attribute' do
-        doc = filter("Issue #{reference}")
-        link = doc.css('a').first
-
-        expect(link).to have_attribute('data-project')
-        expect(link.attr('data-project')).to eq project.id.to_s
-      end
-
-      it 'includes a data-issue attribute' do
-        doc = filter("See #{reference}")
-        link = doc.css('a').first
-
-        expect(link).to have_attribute('data-issue')
-        expect(link.attr('data-issue')).to eq issue.id.to_s
-      end
-
-      it 'supports an :only_path context' do
-        doc = filter("Issue #{reference}", only_path: true)
-        link = doc.css('a').first.attr('href')
-
-        expect(link).not_to match %r(https?://)
-        expect(link).to eq helper.url_for_issue(issue.iid, project, only_path: true)
-      end
-
-      it 'adds to the results hash' do
-        result = reference_pipeline_result("Fixed #{reference}")
-        expect(result[:references][:issue]).to eq [issue]
-      end
-    end
-
-    context 'cross-project reference' do
-      let(:namespace) { create(:namespace, name: 'cross-reference') }
-      let(:project2)  { create(:empty_project, :public, namespace: namespace) }
-      let(:issue)     { create(:issue, project: project2) }
-      let(:reference) { issue.to_reference(project) }
-
-      it 'ignores valid references when cross-reference project uses external tracker' do
-        expect_any_instance_of(Project).to receive(:get_issue).
-          with(issue.iid).and_return(nil)
-
-        exp = act = "Issue #{reference}"
-        expect(filter(act).to_html).to eq exp
-      end
-
-      it 'links to a valid reference' do
-        doc = filter("See #{reference}")
-
-        expect(doc.css('a').first.attr('href')).
-          to eq helper.url_for_issue(issue.iid, project2)
-      end
-
-      it 'links with adjacent text' do
-        doc = filter("Fixed (#{reference}.)")
-        expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
-      end
-
-      it 'ignores invalid issue IDs on the referenced project' do
-        exp = act = "Fixed #{invalidate_reference(reference)}"
-
-        expect(filter(act).to_html).to eq exp
-      end
-
-      it 'adds to the results hash' do
-        result = reference_pipeline_result("Fixed #{reference}")
-        expect(result[:references][:issue]).to eq [issue]
-      end
-    end
-  end
-end
diff --git a/spec/lib/gitlab/markdown/label_reference_filter_spec.rb b/spec/lib/gitlab/markdown/label_reference_filter_spec.rb
deleted file mode 100644
index fc21b65a843..00000000000
--- a/spec/lib/gitlab/markdown/label_reference_filter_spec.rb
+++ /dev/null
@@ -1,144 +0,0 @@
-require 'spec_helper'
-require 'html/pipeline'
-
-module Gitlab::Markdown
-  describe LabelReferenceFilter do
-    include FilterSpecHelper
-
-    let(:project)   { create(:empty_project, :public) }
-    let(:label)     { create(:label, project: project) }
-    let(:reference) { label.to_reference }
-
-    it 'requires project context' do
-      expect { described_class.call('') }.to raise_error(ArgumentError, /:project/)
-    end
-
-    %w(pre code a style).each do |elem|
-      it "ignores valid references contained inside '#{elem}' element" do
-        exp = act = "<#{elem}>Label #{reference}</#{elem}>"
-        expect(filter(act).to_html).to eq exp
-      end
-    end
-
-    it 'includes default classes' do
-      doc = filter("Label #{reference}")
-      expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-label'
-    end
-
-    it 'includes a data-project attribute' do
-      doc = filter("Label #{reference}")
-      link = doc.css('a').first
-
-      expect(link).to have_attribute('data-project')
-      expect(link.attr('data-project')).to eq project.id.to_s
-    end
-
-    it 'includes a data-label attribute' do
-      doc = filter("See #{reference}")
-      link = doc.css('a').first
-
-      expect(link).to have_attribute('data-label')
-      expect(link.attr('data-label')).to eq label.id.to_s
-    end
-
-    it 'supports an :only_path context' do
-      doc = filter("Label #{reference}", only_path: true)
-      link = doc.css('a').first.attr('href')
-
-      expect(link).not_to match %r(https?://)
-      expect(link).to eq urls.namespace_project_issues_path(project.namespace, project, label_name: label.name)
-    end
-
-    it 'adds to the results hash' do
-      result = reference_pipeline_result("Label #{reference}")
-      expect(result[:references][:label]).to eq [label]
-    end
-
-    describe 'label span element' do
-      it 'includes default classes' do
-        doc = filter("Label #{reference}")
-        expect(doc.css('a span').first.attr('class')).to eq 'label color-label'
-      end
-
-      it 'includes a style attribute' do
-        doc = filter("Label #{reference}")
-        expect(doc.css('a span').first.attr('style')).to match(/\Abackground-color: #\h{6}; color: #\h{6}\z/)
-      end
-    end
-
-    context 'Integer-based references' do
-      it 'links to a valid reference' do
-        doc = filter("See #{reference}")
-
-        expect(doc.css('a').first.attr('href')).to eq urls.
-          namespace_project_issues_url(project.namespace, project, label_name: label.name)
-      end
-
-      it 'links with adjacent text' do
-        doc = filter("Label (#{reference}.)")
-        expect(doc.to_html).to match(%r(\(<a.+><span.+>#{label.name}</span></a>\.\)))
-      end
-
-      it 'ignores invalid label IDs' do
-        exp = act = "Label #{invalidate_reference(reference)}"
-
-        expect(filter(act).to_html).to eq exp
-      end
-    end
-
-    context 'String-based single-word references' do
-      let(:label)     { create(:label, name: 'gfm', project: project) }
-      let(:reference) { "#{Label.reference_prefix}#{label.name}" }
-
-      it 'links to a valid reference' do
-        doc = filter("See #{reference}")
-
-        expect(doc.css('a').first.attr('href')).to eq urls.
-          namespace_project_issues_url(project.namespace, project, label_name: label.name)
-        expect(doc.text).to eq 'See gfm'
-      end
-
-      it 'links with adjacent text' do
-        doc = filter("Label (#{reference}.)")
-        expect(doc.to_html).to match(%r(\(<a.+><span.+>#{label.name}</span></a>\.\)))
-      end
-
-      it 'ignores invalid label names' do
-        exp = act = "Label #{Label.reference_prefix}#{label.name.reverse}"
-
-        expect(filter(act).to_html).to eq exp
-      end
-    end
-
-    context 'String-based multi-word references in quotes' do
-      let(:label)     { create(:label, name: 'gfm references', project: project) }
-      let(:reference) { label.to_reference(:name) }
-
-      it 'links to a valid reference' do
-        doc = filter("See #{reference}")
-
-        expect(doc.css('a').first.attr('href')).to eq urls.
-          namespace_project_issues_url(project.namespace, project, label_name: label.name)
-        expect(doc.text).to eq 'See gfm references'
-      end
-
-      it 'links with adjacent text' do
-        doc = filter("Label (#{reference}.)")
-        expect(doc.to_html).to match(%r(\(<a.+><span.+>#{label.name}</span></a>\.\)))
-      end
-
-      it 'ignores invalid label names' do
-        exp = act = %(Label #{Label.reference_prefix}"#{label.name.reverse}")
-
-        expect(filter(act).to_html).to eq exp
-      end
-    end
-
-    describe 'edge cases' do
-      it 'gracefully handles non-references matching the pattern' do
-        exp = act = '(format nil "~0f" 3.0) ; 3.0'
-        expect(filter(act).to_html).to eq exp
-      end
-    end
-  end
-end
diff --git a/spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb b/spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb
deleted file mode 100644
index 3ef6cdfff33..00000000000
--- a/spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-require 'spec_helper'
-
-module Gitlab::Markdown
-  describe MergeRequestReferenceFilter do
-    include FilterSpecHelper
-
-    let(:project) { create(:project, :public) }
-    let(:merge)   { create(:merge_request, source_project: project) }
-
-    it 'requires project context' do
-      expect { described_class.call('') }.to raise_error(ArgumentError, /:project/)
-    end
-
-    %w(pre code a style).each do |elem|
-      it "ignores valid references contained inside '#{elem}' element" do
-        exp = act = "<#{elem}>Merge #{merge.to_reference}</#{elem}>"
-        expect(filter(act).to_html).to eq exp
-      end
-    end
-
-    context 'internal reference' do
-      let(:reference) { merge.to_reference }
-
-      it 'links to a valid reference' do
-        doc = filter("See #{reference}")
-
-        expect(doc.css('a').first.attr('href')).to eq urls.
-          namespace_project_merge_request_url(project.namespace, project, merge)
-      end
-
-      it 'links with adjacent text' do
-        doc = filter("Merge (#{reference}.)")
-        expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
-      end
-
-      it 'ignores invalid merge IDs' do
-        exp = act = "Merge #{invalidate_reference(reference)}"
-
-        expect(filter(act).to_html).to eq exp
-      end
-
-      it 'includes a title attribute' do
-        doc = filter("Merge #{reference}")
-        expect(doc.css('a').first.attr('title')).to eq "Merge Request: #{merge.title}"
-      end
-
-      it 'escapes the title attribute' do
-        merge.update_attribute(:title, %{"></a>whatever<a title="})
-
-        doc = filter("Merge #{reference}")
-        expect(doc.text).to eq "Merge #{reference}"
-      end
-
-      it 'includes default classes' do
-        doc = filter("Merge #{reference}")
-        expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-merge_request'
-      end
-
-      it 'includes a data-project attribute' do
-        doc = filter("Merge #{reference}")
-        link = doc.css('a').first
-
-        expect(link).to have_attribute('data-project')
-        expect(link.attr('data-project')).to eq project.id.to_s
-      end
-
-      it 'includes a data-merge-request attribute' do
-        doc = filter("See #{reference}")
-        link = doc.css('a').first
-
-        expect(link).to have_attribute('data-merge-request')
-        expect(link.attr('data-merge-request')).to eq merge.id.to_s
-      end
-
-      it 'supports an :only_path context' do
-        doc = filter("Merge #{reference}", only_path: true)
-        link = doc.css('a').first.attr('href')
-
-        expect(link).not_to match %r(https?://)
-        expect(link).to eq urls.namespace_project_merge_request_url(project.namespace, project, merge, only_path: true)
-      end
-
-      it 'adds to the results hash' do
-        result = reference_pipeline_result("Merge #{reference}")
-        expect(result[:references][:merge_request]).to eq [merge]
-      end
-    end
-
-    context 'cross-project reference' do
-      let(:namespace) { create(:namespace, name: 'cross-reference') }
-      let(:project2)  { create(:project, :public, namespace: namespace) }
-      let(:merge)     { create(:merge_request, source_project: project2) }
-      let(:reference) { merge.to_reference(project) }
-
-      it 'links to a valid reference' do
-        doc = filter("See #{reference}")
-
-        expect(doc.css('a').first.attr('href')).
-          to eq urls.namespace_project_merge_request_url(project2.namespace,
-                                                        project, merge)
-      end
-
-      it 'links with adjacent text' do
-        doc = filter("Merge (#{reference}.)")
-        expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
-      end
-
-      it 'ignores invalid merge IDs on the referenced project' do
-        exp = act = "Merge #{invalidate_reference(reference)}"
-
-        expect(filter(act).to_html).to eq exp
-      end
-
-      it 'adds to the results hash' do
-        result = reference_pipeline_result("Merge #{reference}")
-        expect(result[:references][:merge_request]).to eq [merge]
-      end
-    end
-  end
-end
diff --git a/spec/lib/gitlab/markdown/redactor_filter_spec.rb b/spec/lib/gitlab/markdown/redactor_filter_spec.rb
deleted file mode 100644
index eea3f1cf370..00000000000
--- a/spec/lib/gitlab/markdown/redactor_filter_spec.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-require 'spec_helper'
-
-module Gitlab::Markdown
-  describe RedactorFilter do
-    include ActionView::Helpers::UrlHelper
-    include FilterSpecHelper
-
-    it 'ignores non-GFM links' do
-      html = %(See <a href="https://google.com/">Google</a>)
-      doc = filter(html, current_user: double)
-
-      expect(doc.css('a').length).to eq 1
-    end
-
-    def reference_link(data)
-      link_to('text', '', class: 'gfm', data: data)
-    end
-
-    context 'with data-project' do
-      it 'removes unpermitted Project references' do
-        user = create(:user)
-        project = create(:empty_project)
-
-        link = reference_link(project: project.id, reference_filter: Gitlab::Markdown::ReferenceFilter.name)
-        doc = filter(link, current_user: user)
-
-        expect(doc.css('a').length).to eq 0
-      end
-
-      it 'allows permitted Project references' do
-        user = create(:user)
-        project = create(:empty_project)
-        project.team << [user, :master]
-
-        link = reference_link(project: project.id, reference_filter: Gitlab::Markdown::ReferenceFilter.name)
-        doc = filter(link, current_user: user)
-
-        expect(doc.css('a').length).to eq 1
-      end
-
-      it 'handles invalid Project references' do
-        link = reference_link(project: 12345, reference_filter: Gitlab::Markdown::ReferenceFilter.name)
-
-        expect { filter(link) }.not_to raise_error
-      end
-    end
-
-    context "for user references" do
-
-      context 'with data-group' do
-        it 'removes unpermitted Group references' do
-          user = create(:user)
-          group = create(:group)
-
-          link = reference_link(group: group.id, reference_filter: Gitlab::Markdown::UserReferenceFilter.name)
-          doc = filter(link, current_user: user)
-
-          expect(doc.css('a').length).to eq 0
-        end
-
-        it 'allows permitted Group references' do
-          user = create(:user)
-          group = create(:group)
-          group.add_developer(user)
-
-          link = reference_link(group: group.id, reference_filter: Gitlab::Markdown::UserReferenceFilter.name)
-          doc = filter(link, current_user: user)
-
-          expect(doc.css('a').length).to eq 1
-        end
-
-        it 'handles invalid Group references' do
-          link = reference_link(group: 12345, reference_filter: Gitlab::Markdown::UserReferenceFilter.name)
-
-          expect { filter(link) }.not_to raise_error
-        end
-      end
-
-      context 'with data-user' do
-        it 'allows any User reference' do
-          user = create(:user)
-
-          link = reference_link(user: user.id, reference_filter: Gitlab::Markdown::UserReferenceFilter.name)
-          doc = filter(link)
-
-          expect(doc.css('a').length).to eq 1
-        end
-      end
-    end
-  end
-end
diff --git a/spec/lib/gitlab/markdown/reference_gatherer_filter_spec.rb b/spec/lib/gitlab/markdown/reference_gatherer_filter_spec.rb
deleted file mode 100644
index 4fa473ad191..00000000000
--- a/spec/lib/gitlab/markdown/reference_gatherer_filter_spec.rb
+++ /dev/null
@@ -1,89 +0,0 @@
-require 'spec_helper'
-
-module Gitlab::Markdown
-  describe ReferenceGathererFilter do
-    include ActionView::Helpers::UrlHelper
-    include FilterSpecHelper
-
-    def reference_link(data)
-      link_to('text', '', class: 'gfm', data: data)
-    end
-
-    context "for issue references" do
-
-      context 'with data-project' do
-        it 'removes unpermitted Project references' do
-          user = create(:user)
-          project = create(:empty_project)
-          issue = create(:issue, project: project)
-
-          link = reference_link(project: project.id, issue: issue.id, reference_filter: Gitlab::Markdown::IssueReferenceFilter.name)
-          result = pipeline_result(link, current_user: user)
-
-          expect(result[:references][:issue]).to be_empty
-        end
-
-        it 'allows permitted Project references' do
-          user = create(:user)
-          project = create(:empty_project)
-          issue = create(:issue, project: project)
-          project.team << [user, :master]
-
-          link = reference_link(project: project.id, issue: issue.id, reference_filter: Gitlab::Markdown::IssueReferenceFilter.name)
-          result = pipeline_result(link, current_user: user)
-
-          expect(result[:references][:issue]).to eq([issue])
-        end
-
-        it 'handles invalid Project references' do
-          link = reference_link(project: 12345, issue: 12345, reference_filter: Gitlab::Markdown::IssueReferenceFilter.name)
-
-          expect { pipeline_result(link) }.not_to raise_error
-        end
-      end
-    end
-
-    context "for user references" do
-
-      context 'with data-group' do
-        it 'removes unpermitted Group references' do
-          user = create(:user)
-          group = create(:group)
-
-          link = reference_link(group: group.id, reference_filter: Gitlab::Markdown::UserReferenceFilter.name)
-          result = pipeline_result(link, current_user: user)
-
-          expect(result[:references][:user]).to be_empty
-        end
-
-        it 'allows permitted Group references' do
-          user = create(:user)
-          group = create(:group)
-          group.add_developer(user)
-
-          link = reference_link(group: group.id, reference_filter: Gitlab::Markdown::UserReferenceFilter.name)
-          result = pipeline_result(link, current_user: user)
-
-          expect(result[:references][:user]).to eq([user])
-        end
-
-        it 'handles invalid Group references' do
-          link = reference_link(group: 12345, reference_filter: Gitlab::Markdown::UserReferenceFilter.name)
-
-          expect { pipeline_result(link) }.not_to raise_error
-        end
-      end
-
-      context 'with data-user' do
-        it 'allows any User reference' do
-          user = create(:user)
-
-          link = reference_link(user: user.id, reference_filter: Gitlab::Markdown::UserReferenceFilter.name)
-          result = pipeline_result(link)
-
-          expect(result[:references][:user]).to eq([user])
-        end
-      end
-    end
-  end
-end
diff --git a/spec/lib/gitlab/markdown/relative_link_filter_spec.rb b/spec/lib/gitlab/markdown/relative_link_filter_spec.rb
deleted file mode 100644
index 027336ceb73..00000000000
--- a/spec/lib/gitlab/markdown/relative_link_filter_spec.rb
+++ /dev/null
@@ -1,149 +0,0 @@
-# encoding: UTF-8
-
-require 'spec_helper'
-
-module Gitlab::Markdown
-  describe RelativeLinkFilter do
-    def filter(doc, contexts = {})
-      contexts.reverse_merge!({
-        commit:         project.commit,
-        project:        project,
-        project_wiki:   project_wiki,
-        ref:            ref,
-        requested_path: requested_path
-      })
-
-      described_class.call(doc, contexts)
-    end
-
-    def image(path)
-      %(<img src="#{path}" />)
-    end
-
-    def link(path)
-      %(<a href="#{path}">#{path}</a>)
-    end
-
-    let(:project)        { create(:project) }
-    let(:project_path)   { project.path_with_namespace }
-    let(:ref)            { 'markdown' }
-    let(:project_wiki)   { nil }
-    let(:requested_path) { '/' }
-
-    shared_examples :preserve_unchanged do
-      it 'does not modify any relative URL in anchor' do
-        doc = filter(link('README.md'))
-        expect(doc.at_css('a')['href']).to eq 'README.md'
-      end
-
-      it 'does not modify any relative URL in image' do
-        doc = filter(image('files/images/logo-black.png'))
-        expect(doc.at_css('img')['src']).to eq 'files/images/logo-black.png'
-      end
-    end
-
-    shared_examples :relative_to_requested do
-      it 'rebuilds URL relative to the requested path' do
-        doc = filter(link('users.md'))
-        expect(doc.at_css('a')['href']).
-          to eq "/#{project_path}/blob/#{ref}/doc/api/users.md"
-      end
-    end
-
-    context 'with a project_wiki' do
-      let(:project_wiki) { double('ProjectWiki') }
-      include_examples :preserve_unchanged
-    end
-
-    context 'without a repository' do
-      let(:project) { create(:empty_project) }
-      include_examples :preserve_unchanged
-    end
-
-    context 'with an empty repository' do
-      let(:project) { create(:project_empty_repo) }
-      include_examples :preserve_unchanged
-    end
-
-    it 'does not raise an exception on invalid URIs' do
-      act = link("://foo")
-      expect { filter(act) }.not_to raise_error
-    end
-
-    context 'with a valid repository' do
-      it 'rebuilds relative URL for a file in the repo' do
-        doc = filter(link('doc/api/README.md'))
-        expect(doc.at_css('a')['href']).
-          to eq "/#{project_path}/blob/#{ref}/doc/api/README.md"
-      end
-
-      it 'rebuilds relative URL for a file in the repo up one directory' do
-        relative_link = link('../api/README.md')
-        doc = filter(relative_link, requested_path: 'doc/update/7.14-to-8.0.md')
-
-        expect(doc.at_css('a')['href']).
-          to eq "/#{project_path}/blob/#{ref}/doc/api/README.md"
-      end
-
-      it 'rebuilds relative URL for a file in the repo up multiple directories' do
-        relative_link = link('../../../api/README.md')
-        doc = filter(relative_link, requested_path: 'doc/foo/bar/baz/README.md')
-
-        expect(doc.at_css('a')['href']).
-          to eq "/#{project_path}/blob/#{ref}/doc/api/README.md"
-      end
-
-      it 'rebuilds relative URL for a file in the repo with an anchor' do
-        doc = filter(link('README.md#section'))
-        expect(doc.at_css('a')['href']).
-          to eq "/#{project_path}/blob/#{ref}/README.md#section"
-      end
-
-      it 'rebuilds relative URL for a directory in the repo' do
-        doc = filter(link('doc/api/'))
-        expect(doc.at_css('a')['href']).
-          to eq "/#{project_path}/tree/#{ref}/doc/api"
-      end
-
-      it 'rebuilds relative URL for an image in the repo' do
-        doc = filter(link('files/images/logo-black.png'))
-        expect(doc.at_css('a')['href']).
-          to eq "/#{project_path}/raw/#{ref}/files/images/logo-black.png"
-      end
-
-      it 'does not modify relative URL with an anchor only' do
-        doc = filter(link('#section-1'))
-        expect(doc.at_css('a')['href']).to eq '#section-1'
-      end
-
-      it 'does not modify absolute URL' do
-        doc = filter(link('http://example.com'))
-        expect(doc.at_css('a')['href']).to eq 'http://example.com'
-      end
-
-      it 'supports Unicode filenames' do
-        path = 'files/images/한글.png'
-        escaped = Addressable::URI.escape(path)
-
-        # Stub these methods so the file doesn't actually need to be in the repo
-        allow_any_instance_of(described_class).
-          to receive(:file_exists?).and_return(true)
-        allow_any_instance_of(described_class).
-          to receive(:image?).with(path).and_return(true)
-
-        doc = filter(image(escaped))
-        expect(doc.at_css('img')['src']).to match '/raw/'
-      end
-
-      context 'when requested path is a file in the repo' do
-        let(:requested_path) { 'doc/api/README.md' }
-        include_examples :relative_to_requested
-      end
-
-      context 'when requested path is a directory in the repo' do
-        let(:requested_path) { 'doc/api' }
-        include_examples :relative_to_requested
-      end
-    end
-  end
-end
diff --git a/spec/lib/gitlab/markdown/sanitization_filter_spec.rb b/spec/lib/gitlab/markdown/sanitization_filter_spec.rb
deleted file mode 100644
index b089729172d..00000000000
--- a/spec/lib/gitlab/markdown/sanitization_filter_spec.rb
+++ /dev/null
@@ -1,199 +0,0 @@
-require 'spec_helper'
-
-module Gitlab::Markdown
-  describe SanitizationFilter do
-    include FilterSpecHelper
-
-    describe 'default whitelist' do
-      it 'sanitizes tags that are not whitelisted' do
-        act = %q{<textarea>no inputs</textarea> and <blink>no blinks</blink>}
-        exp = 'no inputs and no blinks'
-        expect(filter(act).to_html).to eq exp
-      end
-
-      it 'sanitizes tag attributes' do
-        act = %q{<a href="http://example.com/bar.html" onclick="bar">Text</a>}
-        exp = %q{<a href="http://example.com/bar.html">Text</a>}
-        expect(filter(act).to_html).to eq exp
-      end
-
-      it 'sanitizes javascript in attributes' do
-        act = %q(<a href="javascript:alert('foo')">Text</a>)
-        exp = '<a>Text</a>'
-        expect(filter(act).to_html).to eq exp
-      end
-
-      it 'allows whitelisted HTML tags from the user' do
-        exp = act = "<dl>\n<dt>Term</dt>\n<dd>Definition</dd>\n</dl>"
-        expect(filter(act).to_html).to eq exp
-      end
-
-      it 'sanitizes `class` attribute on any element' do
-        act = %q{<strong class="foo">Strong</strong>}
-        expect(filter(act).to_html).to eq %q{<strong>Strong</strong>}
-      end
-
-      it 'sanitizes `id` attribute on any element' do
-        act = %q{<em id="foo">Emphasis</em>}
-        expect(filter(act).to_html).to eq %q{<em>Emphasis</em>}
-      end
-    end
-
-    describe 'custom whitelist' do
-      it 'customizes the whitelist only once' do
-        instance = described_class.new('Foo')
-        3.times { instance.whitelist }
-
-        expect(instance.whitelist[:transformers].size).to eq 5
-      end
-
-      it 'allows syntax highlighting' do
-        exp = act = %q{<pre class="code highlight white c"><code><span class="k">def</span></code></pre>}
-        expect(filter(act).to_html).to eq exp
-      end
-
-      it 'sanitizes `class` attribute from non-highlight spans' do
-        act = %q{<span class="k">def</span>}
-        expect(filter(act).to_html).to eq %q{<span>def</span>}
-      end
-
-      it 'allows `style` attribute on table elements' do
-        html = <<-HTML.strip_heredoc
-        <table>
-          <tr><th style="text-align: center">Head</th></tr>
-          <tr><td style="text-align: right">Body</th></tr>
-        </table>
-        HTML
-
-        doc = filter(html)
-
-        expect(doc.at_css('th')['style']).to eq 'text-align: center'
-        expect(doc.at_css('td')['style']).to eq 'text-align: right'
-      end
-
-      it 'allows `span` elements' do
-        exp = act = %q{<span>Hello</span>}
-        expect(filter(act).to_html).to eq exp
-      end
-
-      it 'removes `rel` attribute from `a` elements' do
-        act = %q{<a href="#" rel="nofollow">Link</a>}
-        exp = %q{<a href="#">Link</a>}
-
-        expect(filter(act).to_html).to eq exp
-      end
-
-      # Adapted from the Sanitize test suite: http://git.io/vczrM
-      protocols = {
-        'protocol-based JS injection: simple, no spaces' => {
-          input:  '<a href="javascript:alert(\'XSS\');">foo</a>',
-          output: '<a>foo</a>'
-        },
-
-        'protocol-based JS injection: simple, spaces before' => {
-          input:  '<a href="javascript    :alert(\'XSS\');">foo</a>',
-          output: '<a>foo</a>'
-        },
-
-        'protocol-based JS injection: simple, spaces after' => {
-          input:  '<a href="javascript:    alert(\'XSS\');">foo</a>',
-          output: '<a>foo</a>'
-        },
-
-        'protocol-based JS injection: simple, spaces before and after' => {
-          input:  '<a href="javascript    :   alert(\'XSS\');">foo</a>',
-          output: '<a>foo</a>'
-        },
-
-        'protocol-based JS injection: preceding colon' => {
-          input:  '<a href=":javascript:alert(\'XSS\');">foo</a>',
-          output: '<a>foo</a>'
-        },
-
-        'protocol-based JS injection: UTF-8 encoding' => {
-          input:  '<a href="javascript&#58;">foo</a>',
-          output: '<a>foo</a>'
-        },
-
-        'protocol-based JS injection: long UTF-8 encoding' => {
-          input:  '<a href="javascript&#0058;">foo</a>',
-          output: '<a>foo</a>'
-        },
-
-        'protocol-based JS injection: long UTF-8 encoding without semicolons' => {
-          input:  '<a href=&#0000106&#0000097&#0000118&#0000097&#0000115&#0000099&#0000114&#0000105&#0000112&#0000116&#0000058&#0000097&#0000108&#0000101&#0000114&#0000116&#0000040&#0000039&#0000088&#0000083&#0000083&#0000039&#0000041>foo</a>',
-          output: '<a>foo</a>'
-        },
-
-        'protocol-based JS injection: hex encoding' => {
-          input:  '<a href="javascript&#x3A;">foo</a>',
-          output: '<a>foo</a>'
-        },
-
-        'protocol-based JS injection: long hex encoding' => {
-          input:  '<a href="javascript&#x003A;">foo</a>',
-          output: '<a>foo</a>'
-        },
-
-        'protocol-based JS injection: hex encoding without semicolons' => {
-          input:  '<a href=&#x6A&#x61&#x76&#x61&#x73&#x63&#x72&#x69&#x70&#x74&#x3A&#x61&#x6C&#x65&#x72&#x74&#x28&#x27&#x58&#x53&#x53&#x27&#x29>foo</a>',
-          output: '<a>foo</a>'
-        },
-
-        'protocol-based JS injection: null char' => {
-          input:  "<a href=java\0script:alert(\"XSS\")>foo</a>",
-          output: '<a href="java"></a>'
-        },
-
-        'protocol-based JS injection: spaces and entities' => {
-          input:  '<a href=" &#14;  javascript:alert(\'XSS\');">foo</a>',
-          output: '<a href="">foo</a>'
-        },
-      }
-
-      protocols.each do |name, data|
-        it "handles #{name}" do
-          doc = filter(data[:input])
-
-          expect(doc.to_html).to eq data[:output]
-        end
-      end
-
-      it 'allows non-standard anchor schemes' do
-        exp = %q{<a href="irc://irc.freenode.net/git">IRC</a>}
-        act = filter(exp)
-
-        expect(act.to_html).to eq exp
-      end
-
-      it 'allows relative links' do
-        exp = %q{<a href="foo/bar.md">foo/bar.md</a>}
-        act = filter(exp)
-
-        expect(act.to_html).to eq exp
-      end
-    end
-
-    context 'when inline_sanitization is true' do
-      it 'uses a stricter whitelist' do
-        doc = filter('<h1>Description</h1>', inline_sanitization: true)
-        expect(doc.to_html.strip).to eq 'Description'
-      end
-
-      %w(pre code img ol ul li).each do |elem|
-        it "removes '#{elem}' elements" do
-          act = "<#{elem}>Description</#{elem}>"
-          expect(filter(act, inline_sanitization: true).to_html.strip).
-            to eq 'Description'
-        end
-      end
-
-      %w(b i strong em a ins del sup sub p).each do |elem|
-        it "still allows '#{elem}' elements" do
-          exp = act = "<#{elem}>Description</#{elem}>"
-          expect(filter(act, inline_sanitization: true).to_html).to eq exp
-        end
-      end
-    end
-  end
-end
diff --git a/spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb b/spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
deleted file mode 100644
index 9d9652dba46..00000000000
--- a/spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
+++ /dev/null
@@ -1,118 +0,0 @@
-require 'spec_helper'
-
-module Gitlab::Markdown
-  describe SnippetReferenceFilter do
-    include FilterSpecHelper
-
-    let(:project)   { create(:empty_project, :public) }
-    let(:snippet)   { create(:project_snippet, project: project) }
-    let(:reference) { snippet.to_reference }
-
-    it 'requires project context' do
-      expect { described_class.call('') }.to raise_error(ArgumentError, /:project/)
-    end
-
-    %w(pre code a style).each do |elem|
-      it "ignores valid references contained inside '#{elem}' element" do
-        exp = act = "<#{elem}>Snippet #{reference}</#{elem}>"
-        expect(filter(act).to_html).to eq exp
-      end
-    end
-
-    context 'internal reference' do
-      it 'links to a valid reference' do
-        doc = filter("See #{reference}")
-
-        expect(doc.css('a').first.attr('href')).to eq urls.
-          namespace_project_snippet_url(project.namespace, project, snippet)
-      end
-
-      it 'links with adjacent text' do
-        doc = filter("Snippet (#{reference}.)")
-        expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
-      end
-
-      it 'ignores invalid snippet IDs' do
-        exp = act = "Snippet #{invalidate_reference(reference)}"
-
-        expect(filter(act).to_html).to eq exp
-      end
-
-      it 'includes a title attribute' do
-        doc = filter("Snippet #{reference}")
-        expect(doc.css('a').first.attr('title')).to eq "Snippet: #{snippet.title}"
-      end
-
-      it 'escapes the title attribute' do
-        snippet.update_attribute(:title, %{"></a>whatever<a title="})
-
-        doc = filter("Snippet #{reference}")
-        expect(doc.text).to eq "Snippet #{reference}"
-      end
-
-      it 'includes default classes' do
-        doc = filter("Snippet #{reference}")
-        expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-snippet'
-      end
-
-      it 'includes a data-project attribute' do
-        doc = filter("Snippet #{reference}")
-        link = doc.css('a').first
-
-        expect(link).to have_attribute('data-project')
-        expect(link.attr('data-project')).to eq project.id.to_s
-      end
-
-      it 'includes a data-snippet attribute' do
-        doc = filter("See #{reference}")
-        link = doc.css('a').first
-
-        expect(link).to have_attribute('data-snippet')
-        expect(link.attr('data-snippet')).to eq snippet.id.to_s
-      end
-
-      it 'supports an :only_path context' do
-        doc = filter("Snippet #{reference}", only_path: true)
-        link = doc.css('a').first.attr('href')
-
-        expect(link).not_to match %r(https?://)
-        expect(link).to eq urls.namespace_project_snippet_url(project.namespace, project, snippet, only_path: true)
-      end
-
-      it 'adds to the results hash' do
-        result = reference_pipeline_result("Snippet #{reference}")
-        expect(result[:references][:snippet]).to eq [snippet]
-      end
-    end
-
-    context 'cross-project reference' do
-      let(:namespace) { create(:namespace, name: 'cross-reference') }
-      let(:project2)  { create(:empty_project, :public, namespace: namespace) }
-      let(:snippet)   { create(:project_snippet, project: project2) }
-      let(:reference) { snippet.to_reference(project) }
-
-      it 'links to a valid reference' do
-        doc = filter("See #{reference}")
-
-        expect(doc.css('a').first.attr('href')).
-          to eq urls.namespace_project_snippet_url(project2.namespace, project2, snippet)
-      end
-
-      it 'links with adjacent text' do
-        doc = filter("See (#{reference}.)")
-        expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
-      end
-
-      it 'ignores invalid snippet IDs on the referenced project' do
-        exp = act = "See #{invalidate_reference(reference)}"
-
-        expect(filter(act).to_html).to eq exp
-      end
-
-      it 'adds to the results hash' do
-        result = reference_pipeline_result("Snippet #{reference}")
-        expect(result[:references][:snippet]).to eq [snippet]
-      end
-    end
-  end
-end
diff --git a/spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb b/spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb
deleted file mode 100644
index 6a490673728..00000000000
--- a/spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require 'spec_helper'
-
-module Gitlab::Markdown
-  describe SyntaxHighlightFilter do
-    include FilterSpecHelper
-
-    it 'highlights valid code blocks' do
-      result = filter('<pre><code>def fun end</code>')
-      expect(result.to_html).to eq("<pre class=\"code highlight js-syntax-highlight plaintext\"><code>def fun end</code></pre>\n")
-    end
-
-    it 'passes through invalid code blocks' do
-      allow_any_instance_of(SyntaxHighlightFilter).to receive(:block_code).and_raise(StandardError)
-
-      result = filter('<pre><code>This is a test</code></pre>')
-      expect(result.to_html).to eq('<pre>This is a test</pre>')
-    end
-  end
-end
diff --git a/spec/lib/gitlab/markdown/table_of_contents_filter_spec.rb b/spec/lib/gitlab/markdown/table_of_contents_filter_spec.rb
deleted file mode 100644
index ddf583a72c1..00000000000
--- a/spec/lib/gitlab/markdown/table_of_contents_filter_spec.rb
+++ /dev/null
@@ -1,99 +0,0 @@
-# encoding: UTF-8
-
-require 'spec_helper'
-
-module Gitlab::Markdown
-  describe TableOfContentsFilter do
-    include FilterSpecHelper
-
-    def header(level, text)
-      "<h#{level}>#{text}</h#{level}>\n"
-    end
-
-    it 'does nothing when :no_header_anchors is truthy' do
-      exp = act = header(1, 'Header')
-      expect(filter(act, no_header_anchors: 1).to_html).to eq exp
-    end
-
-    it 'does nothing with empty headers' do
-      exp = act = header(1, nil)
-      expect(filter(act).to_html).to eq exp
-    end
-
-    1.upto(6) do |i|
-      it "processes h#{i} elements" do
-        html = header(i, "Header #{i}")
-        doc = filter(html)
-
-        expect(doc.css("h#{i} a").first.attr('id')).to eq "header-#{i}"
-      end
-    end
-
-    describe 'anchor tag' do
-      it 'has an `anchor` class' do
-        doc = filter(header(1, 'Header'))
-        expect(doc.css('h1 a').first.attr('class')).to eq 'anchor'
-      end
-
-      it 'links to the id' do
-        doc = filter(header(1, 'Header'))
-        expect(doc.css('h1 a').first.attr('href')).to eq '#header'
-      end
-
-      describe 'generated IDs' do
-        it 'translates spaces to dashes' do
-          doc = filter(header(1, 'This header has spaces in it'))
-          expect(doc.css('h1 a').first.attr('id')).to eq 'this-header-has-spaces-in-it'
-        end
-
-        it 'squeezes multiple spaces and dashes' do
-          doc = filter(header(1, 'This---header     is poorly-formatted'))
-          expect(doc.css('h1 a').first.attr('id')).to eq 'this-header-is-poorly-formatted'
-        end
-
-        it 'removes punctuation' do
-          doc = filter(header(1, "This, header! is, filled. with @ punctuation?"))
-          expect(doc.css('h1 a').first.attr('id')).to eq 'this-header-is-filled-with-punctuation'
-        end
-
-        it 'appends a unique number to duplicates' do
-          doc = filter(header(1, 'One') + header(2, 'One'))
-
-          expect(doc.css('h1 a').first.attr('id')).to eq 'one'
-          expect(doc.css('h2 a').first.attr('id')).to eq 'one-1'
-        end
-
-        it 'supports Unicode' do
-          doc = filter(header(1, '한글'))
-          expect(doc.css('h1 a').first.attr('id')).to eq '한글'
-          expect(doc.css('h1 a').first.attr('href')).to eq '#한글'
-        end
-      end
-    end
-
-    describe 'result' do
-      def result(html)
-        HTML::Pipeline.new([described_class]).call(html)
-      end
-
-      let(:results) { result(header(1, 'Header 1') + header(2, 'Header 2')) }
-      let(:doc) { Nokogiri::XML::DocumentFragment.parse(results[:toc]) }
-
-      it 'is contained within a `ul` element' do
-        expect(doc.children.first.name).to eq 'ul'
-        expect(doc.children.first.attr('class')).to eq 'section-nav'
-      end
-
-      it 'contains an `li` element for each header' do
-        expect(doc.css('li').length).to eq 2
-
-        links = doc.css('li a')
-
-        expect(links.first.attr('href')).to eq '#header-1'
-        expect(links.first.text).to eq 'Header 1'
-        expect(links.last.attr('href')).to eq '#header-2'
-        expect(links.last.text).to eq 'Header 2'
-      end
-    end
-  end
-end
diff --git a/spec/lib/gitlab/markdown/task_list_filter_spec.rb b/spec/lib/gitlab/markdown/task_list_filter_spec.rb
deleted file mode 100644
index 94f39cc966e..00000000000
--- a/spec/lib/gitlab/markdown/task_list_filter_spec.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'spec_helper'
-
-module Gitlab::Markdown
-  describe TaskListFilter do
-    include FilterSpecHelper
-
-    it 'does not apply `task-list` class to non-task lists' do
-      exp = act = %(<ul><li>Item</li></ul>)
-      expect(filter(act).to_html).to eq exp
-    end
-  end
-end
diff --git a/spec/lib/gitlab/markdown/upload_link_filter_spec.rb b/spec/lib/gitlab/markdown/upload_link_filter_spec.rb
deleted file mode 100644
index 9ae45a6f559..00000000000
--- a/spec/lib/gitlab/markdown/upload_link_filter_spec.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-# encoding: UTF-8
-
-require 'spec_helper'
-
-module Gitlab::Markdown
-  describe UploadLinkFilter do
-    def filter(doc, contexts = {})
-      contexts.reverse_merge!({
-        project: project
-      })
-
-      described_class.call(doc, contexts)
-    end
-
-    def image(path)
-      %(<img src="#{path}" />)
-    end
-
-    def link(path)
-      %(<a href="#{path}">#{path}</a>)
-    end
-
-    let(:project) { create(:project) }
-
-    shared_examples :preserve_unchanged do
-      it 'does not modify any relative URL in anchor' do
-        doc = filter(link('README.md'))
-        expect(doc.at_css('a')['href']).to eq 'README.md'
-      end
-
-      it 'does not modify any relative URL in image' do
-        doc = filter(image('files/images/logo-black.png'))
-        expect(doc.at_css('img')['src']).to eq 'files/images/logo-black.png'
-      end
-    end
-
-    it 'does not raise an exception on invalid URIs' do
-      act = link("://foo")
-      expect { filter(act) }.not_to raise_error
-    end
-
-    context 'with a valid repository' do
-      it 'rebuilds relative URL for a link' do
-        doc = filter(link('/uploads/e90decf88d8f96fe9e1389afc2e4a91f/test.jpg'))
-        expect(doc.at_css('a')['href']).
-          to eq "#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}/uploads/e90decf88d8f96fe9e1389afc2e4a91f/test.jpg"
-      end
-
-      it 'rebuilds relative URL for an image' do
-        doc = filter(link('/uploads/e90decf88d8f96fe9e1389afc2e4a91f/test.jpg'))
-        expect(doc.at_css('a')['href']).
-          to eq "#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}/uploads/e90decf88d8f96fe9e1389afc2e4a91f/test.jpg"
-      end
-
-      it 'does not modify absolute URL' do
-        doc = filter(link('http://example.com'))
-        expect(doc.at_css('a')['href']).to eq 'http://example.com'
-      end
-
-      it 'supports Unicode filenames' do
-        path = '/uploads/한글.png'
-        escaped = Addressable::URI.escape(path)
-
-        # Stub these methods so the file doesn't actually need to be in the repo
-        allow_any_instance_of(described_class).
-          to receive(:file_exists?).and_return(true)
-        allow_any_instance_of(described_class).
-          to receive(:image?).with(path).and_return(true)
-
-        doc = filter(image(escaped))
-        expect(doc.at_css('img')['src']).to match "#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}/uploads/%ED%95%9C%EA%B8%80.png"
-      end
-    end
-  end
-end
diff --git a/spec/lib/gitlab/markdown/user_reference_filter_spec.rb b/spec/lib/gitlab/markdown/user_reference_filter_spec.rb
deleted file mode 100644
index d9e0d7c42db..00000000000
--- a/spec/lib/gitlab/markdown/user_reference_filter_spec.rb
+++ /dev/null
@@ -1,122 +0,0 @@
-require 'spec_helper'
-
-module Gitlab::Markdown
-  describe UserReferenceFilter do
-    include FilterSpecHelper
-
-    let(:project)   { create(:empty_project, :public) }
-    let(:user)      { create(:user) }
-    let(:reference) { user.to_reference }
-
-    it 'requires project context' do
-      expect { described_class.call('') }.to raise_error(ArgumentError, /:project/)
-    end
-
-    it 'ignores invalid users' do
-      exp = act = "Hey #{invalidate_reference(reference)}"
-      expect(filter(act).to_html).to eq(exp)
-    end
-
-    %w(pre code a style).each do |elem|
-      it "ignores valid references contained inside '#{elem}' element" do
-        exp = act = "<#{elem}>Hey #{reference}</#{elem}>"
-        expect(filter(act).to_html).to eq exp
-      end
-    end
-
-    context 'mentioning @all' do
-      let(:reference) { User.reference_prefix + 'all' }
-
-      before do
-        project.team << [project.creator, :developer]
-      end
-
-      it 'supports a special @all mention' do
-        doc = filter("Hey #{reference}")
-        expect(doc.css('a').length).to eq 1
-        expect(doc.css('a').first.attr('href'))
-          .to eq urls.namespace_project_url(project.namespace, project)
-      end
-
-      it 'adds to the results hash' do
-        result = reference_pipeline_result("Hey #{reference}")
-        expect(result[:references][:user]).to eq [project.creator]
-      end
-    end
-
-    context 'mentioning a user' do
-      it 'links to a User' do
-        doc = filter("Hey #{reference}")
-        expect(doc.css('a').first.attr('href')).to eq urls.user_url(user)
-      end
-
-      it 'links to a User with a period' do
-        user = create(:user, name: 'alphA.Beta')
-
-        doc = filter("Hey #{user.to_reference}")
-        expect(doc.css('a').length).to eq 1
-      end
-
-      it 'links to a User with an underscore' do
-        user = create(:user, name: 'ping_pong_king')
-
-        doc = filter("Hey #{user.to_reference}")
-        expect(doc.css('a').length).to eq 1
-      end
-
-      it 'includes a data-user attribute' do
-        doc = filter("Hey #{reference}")
-        link = doc.css('a').first
-
-        expect(link).to have_attribute('data-user')
-        expect(link.attr('data-user')).to eq user.namespace.owner_id.to_s
-      end
-
-      it 'adds to the results hash' do
-        result = reference_pipeline_result("Hey #{reference}")
-        expect(result[:references][:user]).to eq [user]
-      end
-    end
-
-    context 'mentioning a group' do
-      let(:group)     { create(:group) }
-      let(:reference) { group.to_reference }
-
-      it 'links to the Group' do
-        doc = filter("Hey #{reference}")
-        expect(doc.css('a').first.attr('href')).to eq urls.group_url(group)
-      end
-
-      it 'includes a data-group attribute' do
-        doc = filter("Hey #{reference}")
-        link = doc.css('a').first
-
-        expect(link).to have_attribute('data-group')
-        expect(link.attr('data-group')).to eq group.id.to_s
-      end
-
-      it 'adds to the results hash' do
-        result = reference_pipeline_result("Hey #{reference}")
-        expect(result[:references][:user]).to eq group.users
-      end
-    end
-
-    it 'links with adjacent text' do
-      doc = filter("Mention me (#{reference}.)")
-      expect(doc.to_html).to match(/\(<a.+>#{reference}<\/a>\.\)/)
-    end
-
-    it 'includes default classes' do
-      doc = filter("Hey #{reference}")
-      expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-project_member'
-    end
-
-    it 'supports an :only_path context' do
-      doc = filter("Hey #{reference}", only_path: true)
-      link = doc.css('a').first.attr('href')
-
-      expect(link).not_to match %r(https?://)
-      expect(link).to eq urls.user_path(user)
-    end
-  end
-end
-- 
cgit v1.2.1


From 611912fe6870cac43fef9eea389f1229945f186a Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 7 Dec 2015 19:40:46 -0500
Subject: Store the demodulized reference filter name in data attribute

---
 lib/gitlab/markdown/filter/reference_gatherer_filter.rb    |  2 +-
 lib/gitlab/markdown/reference_filter.rb                    |  6 +++---
 spec/lib/gitlab/markdown/filter/redactor_filter_spec.rb    | 14 +++++++-------
 .../markdown/filter/reference_gatherer_filter_spec.rb      | 14 +++++++-------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/lib/gitlab/markdown/filter/reference_gatherer_filter.rb b/lib/gitlab/markdown/filter/reference_gatherer_filter.rb
index 00f983675e6..62f241b4967 100644
--- a/lib/gitlab/markdown/filter/reference_gatherer_filter.rb
+++ b/lib/gitlab/markdown/filter/reference_gatherer_filter.rb
@@ -31,7 +31,7 @@ module Gitlab
         return unless node.has_attribute?('data-reference-filter')
 
         reference_type = node.attr('data-reference-filter')
-        reference_filter = reference_type.constantize
+        reference_filter = Gitlab::Markdown.const_get(reference_type)
 
         return if context[:reference_filter] && reference_filter != context[:reference_filter]
 
diff --git a/lib/gitlab/markdown/reference_filter.rb b/lib/gitlab/markdown/reference_filter.rb
index 1b741d647d1..3b83b8bd8f8 100644
--- a/lib/gitlab/markdown/reference_filter.rb
+++ b/lib/gitlab/markdown/reference_filter.rb
@@ -57,14 +57,14 @@ module Gitlab
       # Examples:
       #
       #   data_attribute(project: 1, issue: 2)
-      #   # => "data-reference-filter=\"Gitlab::Markdown::SomeReferenceFilter\" data-project=\"1\" data-issue=\"2\""
+      #   # => "data-reference-filter=\"SomeReferenceFilter\" data-project=\"1\" data-issue=\"2\""
       #
       #   data_attribute(project: 3, merge_request: 4)
-      #   # => "data-reference-filter=\"Gitlab::Markdown::SomeReferenceFilter\" data-project=\"3\" data-merge-request=\"4\""
+      #   # => "data-reference-filter=\"SomeReferenceFilter\" data-project=\"3\" data-merge-request=\"4\""
       #
       # Returns a String
       def data_attribute(attributes = {})
-        attributes[:reference_filter] = self.class.name
+        attributes[:reference_filter] = self.class.name.demodulize
         attributes.map { |key, value| %Q(data-#{key.to_s.dasherize}="#{value}") }.join(" ")
       end
 
diff --git a/spec/lib/gitlab/markdown/filter/redactor_filter_spec.rb b/spec/lib/gitlab/markdown/filter/redactor_filter_spec.rb
index c177d6950a0..7760a1c86fa 100644
--- a/spec/lib/gitlab/markdown/filter/redactor_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/filter/redactor_filter_spec.rb
@@ -20,7 +20,7 @@ describe Gitlab::Markdown::RedactorFilter do
       user = create(:user)
       project = create(:empty_project)
 
-      link = reference_link(project: project.id, reference_filter: Gitlab::Markdown::ReferenceFilter.name)
+      link = reference_link(project: project.id, reference_filter: 'ReferenceFilter')
       doc = filter(link, current_user: user)
 
       expect(doc.css('a').length).to eq 0
@@ -31,14 +31,14 @@ describe Gitlab::Markdown::RedactorFilter do
       project = create(:empty_project)
       project.team << [user, :master]
 
-      link = reference_link(project: project.id, reference_filter: Gitlab::Markdown::ReferenceFilter.name)
+      link = reference_link(project: project.id, reference_filter: 'ReferenceFilter')
       doc = filter(link, current_user: user)
 
       expect(doc.css('a').length).to eq 1
     end
 
     it 'handles invalid Project references' do
-      link = reference_link(project: 12345, reference_filter: Gitlab::Markdown::ReferenceFilter.name)
+      link = reference_link(project: 12345, reference_filter: 'ReferenceFilter')
 
       expect { filter(link) }.not_to raise_error
     end
@@ -51,7 +51,7 @@ describe Gitlab::Markdown::RedactorFilter do
         user = create(:user)
         group = create(:group)
 
-        link = reference_link(group: group.id, reference_filter: Gitlab::Markdown::UserReferenceFilter.name)
+        link = reference_link(group: group.id, reference_filter: 'UserReferenceFilter')
         doc = filter(link, current_user: user)
 
         expect(doc.css('a').length).to eq 0
@@ -62,14 +62,14 @@ describe Gitlab::Markdown::RedactorFilter do
         group = create(:group)
         group.add_developer(user)
 
-        link = reference_link(group: group.id, reference_filter: Gitlab::Markdown::UserReferenceFilter.name)
+        link = reference_link(group: group.id, reference_filter: 'UserReferenceFilter')
         doc = filter(link, current_user: user)
 
         expect(doc.css('a').length).to eq 1
       end
 
       it 'handles invalid Group references' do
-        link = reference_link(group: 12345, reference_filter: Gitlab::Markdown::UserReferenceFilter.name)
+        link = reference_link(group: 12345, reference_filter: 'UserReferenceFilter')
 
         expect { filter(link) }.not_to raise_error
       end
@@ -79,7 +79,7 @@ describe Gitlab::Markdown::RedactorFilter do
       it 'allows any User reference' do
         user = create(:user)
 
-        link = reference_link(user: user.id, reference_filter: Gitlab::Markdown::UserReferenceFilter.name)
+        link = reference_link(user: user.id, reference_filter: 'UserReferenceFilter')
         doc = filter(link)
 
         expect(doc.css('a').length).to eq 1
diff --git a/spec/lib/gitlab/markdown/filter/reference_gatherer_filter_spec.rb b/spec/lib/gitlab/markdown/filter/reference_gatherer_filter_spec.rb
index 0884f53abe5..caa9d5f36cc 100644
--- a/spec/lib/gitlab/markdown/filter/reference_gatherer_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/filter/reference_gatherer_filter_spec.rb
@@ -16,7 +16,7 @@ describe Gitlab::Markdown::ReferenceGathererFilter do
         project = create(:empty_project)
         issue = create(:issue, project: project)
 
-        link = reference_link(project: project.id, issue: issue.id, reference_filter: Gitlab::Markdown::IssueReferenceFilter.name)
+        link = reference_link(project: project.id, issue: issue.id, reference_filter: 'IssueReferenceFilter')
         result = pipeline_result(link, current_user: user)
 
         expect(result[:references][:issue]).to be_empty
@@ -28,14 +28,14 @@ describe Gitlab::Markdown::ReferenceGathererFilter do
         issue = create(:issue, project: project)
         project.team << [user, :master]
 
-        link = reference_link(project: project.id, issue: issue.id, reference_filter: Gitlab::Markdown::IssueReferenceFilter.name)
+        link = reference_link(project: project.id, issue: issue.id, reference_filter: 'IssueReferenceFilter')
         result = pipeline_result(link, current_user: user)
 
         expect(result[:references][:issue]).to eq([issue])
       end
 
       it 'handles invalid Project references' do
-        link = reference_link(project: 12345, issue: 12345, reference_filter: Gitlab::Markdown::IssueReferenceFilter.name)
+        link = reference_link(project: 12345, issue: 12345, reference_filter: 'IssueReferenceFilter')
 
         expect { pipeline_result(link) }.not_to raise_error
       end
@@ -49,7 +49,7 @@ describe Gitlab::Markdown::ReferenceGathererFilter do
         user = create(:user)
         group = create(:group)
 
-        link = reference_link(group: group.id, reference_filter: Gitlab::Markdown::UserReferenceFilter.name)
+        link = reference_link(group: group.id, reference_filter: 'UserReferenceFilter')
         result = pipeline_result(link, current_user: user)
 
         expect(result[:references][:user]).to be_empty
@@ -60,14 +60,14 @@ describe Gitlab::Markdown::ReferenceGathererFilter do
         group = create(:group)
         group.add_developer(user)
 
-        link = reference_link(group: group.id, reference_filter: Gitlab::Markdown::UserReferenceFilter.name)
+        link = reference_link(group: group.id, reference_filter: 'UserReferenceFilter')
         result = pipeline_result(link, current_user: user)
 
         expect(result[:references][:user]).to eq([user])
       end
 
       it 'handles invalid Group references' do
-        link = reference_link(group: 12345, reference_filter: Gitlab::Markdown::UserReferenceFilter.name)
+        link = reference_link(group: 12345, reference_filter: 'UserReferenceFilter')
 
         expect { pipeline_result(link) }.not_to raise_error
       end
@@ -77,7 +77,7 @@ describe Gitlab::Markdown::ReferenceGathererFilter do
       it 'allows any User reference' do
         user = create(:user)
 
-        link = reference_link(user: user.id, reference_filter: Gitlab::Markdown::UserReferenceFilter.name)
+        link = reference_link(user: user.id, reference_filter: 'UserReferenceFilter')
         result = pipeline_result(link)
 
         expect(result[:references][:user]).to eq([user])
-- 
cgit v1.2.1


From 13f44822d97e643b55047cf619f7bb1f354f165b Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Tue, 8 Dec 2015 12:29:48 +0100
Subject: Move CombinedPipeline methods around

---
 lib/gitlab/markdown/combined_pipeline.rb      | 12 +++++++-----
 lib/gitlab/markdown/pipeline/full_pipeline.rb |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/gitlab/markdown/combined_pipeline.rb b/lib/gitlab/markdown/combined_pipeline.rb
index a3d717550f5..6b08a5e9f72 100644
--- a/lib/gitlab/markdown/combined_pipeline.rb
+++ b/lib/gitlab/markdown/combined_pipeline.rb
@@ -7,16 +7,18 @@ module Gitlab
         Class.new(Pipeline) do
           const_set :PIPELINES, pipelines
 
+          def self.pipelines
+            self::PIPELINES
+          end
+
           def self.filters
             pipelines.flat_map(&:filters)
           end
 
           def self.transform_context(context)
-            pipelines.reduce(context) { |context, pipeline| pipeline.transform_context(context) }
-          end
-
-          def self.pipelines
-            self::PIPELINES
+            pipelines.reduce(context) do |context, pipeline|
+              pipeline.transform_context(context)
+            end
           end
         end
       end
diff --git a/lib/gitlab/markdown/pipeline/full_pipeline.rb b/lib/gitlab/markdown/pipeline/full_pipeline.rb
index 553e9367c1c..b3b7a3c27c0 100644
--- a/lib/gitlab/markdown/pipeline/full_pipeline.rb
+++ b/lib/gitlab/markdown/pipeline/full_pipeline.rb
@@ -3,7 +3,7 @@ require 'gitlab/markdown'
 module Gitlab
   module Markdown
     class FullPipeline < CombinedPipeline.new(PlainMarkdownPipeline, GfmPipeline)
-      
+
     end
   end
 end
-- 
cgit v1.2.1


From 1a10945066d0da1801bb4cf89ce5f54996f1756f Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Tue, 8 Dec 2015 13:40:23 +0100
Subject: Fix RedactorFilter

---
 lib/gitlab/markdown/filter/redactor_filter.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/gitlab/markdown/filter/redactor_filter.rb b/lib/gitlab/markdown/filter/redactor_filter.rb
index bea714a01e7..33ef7ce18b5 100644
--- a/lib/gitlab/markdown/filter/redactor_filter.rb
+++ b/lib/gitlab/markdown/filter/redactor_filter.rb
@@ -27,7 +27,7 @@ module Gitlab
       def user_can_reference?(node)
         if node.has_attribute?('data-reference-filter')
           reference_type = node.attr('data-reference-filter')
-          reference_filter = reference_type.constantize
+          reference_filter = Gitlab::Markdown.const_get(reference_type)
 
           reference_filter.user_can_reference?(current_user, node, context)
         else
-- 
cgit v1.2.1