From d597a0a21ab7a589eb8c959e3062632f472ee099 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Fri, 11 Dec 2015 16:42:40 +0100
Subject: Pass all requests from NGINX to gitlab-workhorse

---
 lib/support/nginx/gitlab     | 146 +-----------------------------------------
 lib/support/nginx/gitlab-ssl | 147 +------------------------------------------
 2 files changed, 3 insertions(+), 290 deletions(-)

(limited to 'lib')

diff --git a/lib/support/nginx/gitlab b/lib/support/nginx/gitlab
index 2a79fbdcf93..fc5475c4eef 100644
--- a/lib/support/nginx/gitlab
+++ b/lib/support/nginx/gitlab
@@ -10,34 +10,12 @@
 ## If you change this file in a Merge Request, please also create
 ## a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
 ##
-##################################
-##        CHUNKED TRANSFER      ##
-##################################
-##
-## It is a known issue that Git-over-HTTP requires chunked transfer encoding [0]
-## which is not supported by Nginx < 1.3.9 [1]. As a result, pushing a large object
-## with Git (i.e. a single large file) can lead to a 411 error. In theory you can get
-## around this by tweaking this configuration file and either:
-## - installing an old version of Nginx with the chunkin module [2] compiled in, or
-## - using a newer version of Nginx.
-##
-## At the time of writing we do not know if either of these theoretical solutions works.
-## As a workaround users can use Git over SSH to push large files.
-##
-## [0] https://git.kernel.org/cgit/git/git.git/tree/Documentation/technical/http-protocol.txt#n99
-## [1] https://github.com/agentzh/chunkin-nginx-module#status
-## [2] https://github.com/agentzh/chunkin-nginx-module
-##
 ###################################
 ##         configuration         ##
 ###################################
 ##
 ## See installation.md#using-https for additional HTTPS configuration details.
 
-upstream gitlab {
-  server unix:/home/git/gitlab/tmp/sockets/gitlab.socket fail_timeout=0;
-}
-
 upstream gitlab-workhorse {
   server unix:/home/git/gitlab/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
 }
@@ -54,10 +32,6 @@ server {
   server_tokens off; ## Don't show the nginx version number, a security best practice
   root /home/git/gitlab/public;
 
-  ## Increase this if you want to upload large attachments
-  ## Or if you want to accept large git objects over http
-  client_max_body_size 20m;
-
   ## See app/controllers/application_controller.rb for headers set
 
   ## Individual nginx logs for this GitLab vhost
@@ -65,103 +39,8 @@ server {
   error_log   /var/log/nginx/gitlab_error.log;
 
   location / {
-    ## Serve static files from defined root folder.
-    ## @gitlab is a named location for the upstream fallback, see below.
-    try_files $uri /index.html $uri.html @gitlab;
-  }
-
-  ## We route uploads through GitLab to prevent XSS and enforce access control.
-  location /uploads/ {
-    ## If you use HTTPS make sure you disable gzip compression
-    ## to be safe against BREACH attack.
-    # gzip off;
-
-    ## https://github.com/gitlabhq/gitlabhq/issues/694
-    ## Some requests take more than 30 seconds.
-    proxy_read_timeout      300;
-    proxy_connect_timeout   300;
-    proxy_redirect          off;
-
-    proxy_set_header    Host                $http_host;
-    proxy_set_header    X-Real-IP           $remote_addr;
-    proxy_set_header    X-Forwarded-For     $proxy_add_x_forwarded_for;
-    proxy_set_header    X-Forwarded-Proto   $scheme;
-    proxy_set_header    X-Frame-Options     SAMEORIGIN;
-
-    proxy_pass http://gitlab;
-  }
-
-  ## If a file, which is not found in the root folder is requested,
-  ## then the proxy passes the request to the upsteam (gitlab unicorn).
-  location @gitlab {
-    ## If you use HTTPS make sure you disable gzip compression
-    ## to be safe against BREACH attack.
-    # gzip off;
-
-    ## https://github.com/gitlabhq/gitlabhq/issues/694
-    ## Some requests take more than 30 seconds.
-    proxy_read_timeout      300;
-    proxy_connect_timeout   300;
-    proxy_redirect          off;
-
-    proxy_set_header    Host                $http_host;
-    proxy_set_header    X-Real-IP           $remote_addr;
-    proxy_set_header    X-Forwarded-For     $proxy_add_x_forwarded_for;
-    proxy_set_header    X-Forwarded-Proto   $scheme;
-    proxy_set_header    X-Frame-Options     SAMEORIGIN;
-
-    proxy_pass http://gitlab;
-  }
-
-  location ~ ^/[\w\.-]+/[\w\.-]+/gitlab-lfs/objects {
-    client_max_body_size 0;
-    # 'Error' 418 is a hack to re-use the @gitlab-workhorse block
-    error_page 418 = @gitlab-workhorse;
-    return 418;
-  }
-
-  location ~ ^/[\w\.-]+/[\w\.-]+/(info/refs|git-upload-pack|git-receive-pack)$ {
-    client_max_body_size 0;
-    # 'Error' 418 is a hack to re-use the @gitlab-workhorse block
-    error_page 418 = @gitlab-workhorse;
-    return 418;
-  }
-
-  location ~ ^/[\w\.-]+/[\w\.-]+/repository/archive {
-    client_max_body_size 0;
-    # 'Error' 418 is a hack to re-use the @gitlab-workhorse block
-    error_page 418 = @gitlab-workhorse;
-    return 418;
-  }
-
-  location ~ ^/api/v3/projects/.*/repository/archive {
-    client_max_body_size 0;
-    # 'Error' 418 is a hack to re-use the @gitlab-workhorse block
-    error_page 418 = @gitlab-workhorse;
-    return 418;
-  }
-
-  # Build artifacts should be submitted to this location
-  location ~ ^/[\w\.-]+/[\w\.-]+/builds/download {
     client_max_body_size 0;
-    # 'Error' 418 is a hack to re-use the @gitlab-workhorse block
-    error_page 418 = @gitlab-workhorse;
-    return 418;
-  }
-
-  # Build artifacts should be submitted to this location
-  location ~ /ci/api/v1/builds/[0-9]+/artifacts {
-    client_max_body_size 0;
-    # 'Error' 418 is a hack to re-use the @gitlab-workhorse block
-    error_page 418 = @gitlab-workhorse;
-    return 418;
-  }
-
-  location @gitlab-workhorse {
-    client_max_body_size 0;
-    ## If you use HTTPS make sure you disable gzip compression
-    ## to be safe against BREACH attack.
-    # gzip off;
+    gzip off;
 
     ## https://github.com/gitlabhq/gitlabhq/issues/694
     ## Some requests take more than 30 seconds.
@@ -169,14 +48,7 @@ server {
     proxy_connect_timeout   300;
     proxy_redirect          off;
 
-    # Do not buffer Git HTTP responses
-    proxy_buffering off;
-
-    # The following settings only work with NGINX 1.7.11 or newer
-    #
-    # # Pass chunked request bodies to gitlab-workhorse as-is
-    # proxy_request_buffering off;
-    # proxy_http_version 1.1;
+    proxy_http_version 1.1;
 
     proxy_set_header    Host                $http_host;
     proxy_set_header    X-Real-IP           $remote_addr;
@@ -185,18 +57,4 @@ server {
 
     proxy_pass http://gitlab-workhorse;
   }
-
-  ## Enable gzip compression as per rails guide:
-  ## http://guides.rubyonrails.org/asset_pipeline.html#gzip-compression
-  ## WARNING: If you are using relative urls remove the block below
-  ## See config/application.rb under "Relative url support" for the list of
-  ## other files that need to be changed for relative url support
-  location ~ ^/(assets)/ {
-    root /home/git/gitlab/public;
-    gzip_static on; # to serve pre-gzipped version
-    expires max;
-    add_header Cache-Control public;
-  }
-
-  error_page 502 /502.html;
 }
diff --git a/lib/support/nginx/gitlab-ssl b/lib/support/nginx/gitlab-ssl
index 79fe1474821..1e5f85413ec 100644
--- a/lib/support/nginx/gitlab-ssl
+++ b/lib/support/nginx/gitlab-ssl
@@ -14,34 +14,12 @@
 ## If you change this file in a Merge Request, please also create
 ## a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
 ##
-##################################
-##        CHUNKED TRANSFER      ##
-##################################
-##
-## It is a known issue that Git-over-HTTP requires chunked transfer encoding [0]
-## which is not supported by Nginx < 1.3.9 [1]. As a result, pushing a large object
-## with Git (i.e. a single large file) can lead to a 411 error. In theory you can get
-## around this by tweaking this configuration file and either:
-## - installing an old version of Nginx with the chunkin module [2] compiled in, or
-## - using a newer version of Nginx.
-##
-## At the time of writing we do not know if either of these theoretical solutions works.
-## As a workaround users can use Git over SSH to push large files.
-##
-## [0] https://git.kernel.org/cgit/git/git.git/tree/Documentation/technical/http-protocol.txt#n99
-## [1] https://github.com/agentzh/chunkin-nginx-module#status
-## [2] https://github.com/agentzh/chunkin-nginx-module
-##
 ###################################
 ##         configuration         ##
 ###################################
 ##
 ## See installation.md#using-https for additional HTTPS configuration details.
 
-upstream gitlab {
-  server unix:/home/git/gitlab/tmp/sockets/gitlab.socket fail_timeout=0;
-}
-
 upstream gitlab-workhorse {
   server unix:/home/git/gitlab/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
 }
@@ -61,7 +39,6 @@ server {
   error_log   /var/log/nginx/gitlab_error.log;
 }
 
-
 ## HTTPS host
 server {
   listen 0.0.0.0:443 ssl;
@@ -70,10 +47,6 @@ server {
   server_tokens off; ## Don't show the nginx version number, a security best practice
   root /home/git/gitlab/public;
 
-  ## Increase this if you want to upload large attachments
-  ## Or if you want to accept large git objects over http
-  client_max_body_size 20m;
-
   ## Strong SSL Security
   ## https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html & https://cipherli.st/
   ssl on;
@@ -110,104 +83,7 @@ server {
   error_log   /var/log/nginx/gitlab_error.log;
 
   location / {
-    ## Serve static files from defined root folder.
-    ## @gitlab is a named location for the upstream fallback, see below.
-    try_files $uri /index.html $uri.html @gitlab;
-  }
-
-  ## We route uploads through GitLab to prevent XSS and enforce access control.
-  location /uploads/ {
-    ## If you use HTTPS make sure you disable gzip compression
-    ## to be safe against BREACH attack.
-    gzip off;
-
-    ## https://github.com/gitlabhq/gitlabhq/issues/694
-    ## Some requests take more than 30 seconds.
-    proxy_read_timeout      300;
-    proxy_connect_timeout   300;
-    proxy_redirect          off;
-
-    proxy_set_header    Host                $http_host;
-    proxy_set_header    X-Real-IP           $remote_addr;
-    proxy_set_header    X-Forwarded-Ssl     on;
-    proxy_set_header    X-Forwarded-For     $proxy_add_x_forwarded_for;
-    proxy_set_header    X-Forwarded-Proto   $scheme;
-    proxy_set_header    X-Frame-Options     SAMEORIGIN;
-
-    proxy_pass http://gitlab;
-  }
-
-  ## If a file, which is not found in the root folder is requested,
-  ## then the proxy passes the request to the upsteam (gitlab unicorn).
-  location @gitlab {
-    ## If you use HTTPS make sure you disable gzip compression
-    ## to be safe against BREACH attack.
-    gzip off;
-
-    ## https://github.com/gitlabhq/gitlabhq/issues/694
-    ## Some requests take more than 30 seconds.
-    proxy_read_timeout      300;
-    proxy_connect_timeout   300;
-    proxy_redirect          off;
-
-    proxy_set_header    Host                $http_host;
-    proxy_set_header    X-Real-IP           $remote_addr;
-    proxy_set_header    X-Forwarded-Ssl     on;
-    proxy_set_header    X-Forwarded-For     $proxy_add_x_forwarded_for;
-    proxy_set_header    X-Forwarded-Proto   $scheme;
-    proxy_set_header    X-Frame-Options     SAMEORIGIN;
-
-    proxy_pass http://gitlab;
-  }
-
-  location ~ ^/[\w\.-]+/[\w\.-]+/gitlab-lfs/objects {
-    client_max_body_size 0;
-    # 'Error' 418 is a hack to re-use the @gitlab-workhorse block
-    error_page 418 = @gitlab-workhorse;
-    return 418;
-  }
-
-  location ~ ^/[\w\.-]+/[\w\.-]+/(info/refs|git-upload-pack|git-receive-pack)$ {
-    client_max_body_size 0;
-    # 'Error' 418 is a hack to re-use the @gitlab-workhorse block
-    error_page 418 = @gitlab-workhorse;
-    return 418;
-  }
-
-  location ~ ^/[\w\.-]+/[\w\.-]+/repository/archive {
     client_max_body_size 0;
-    # 'Error' 418 is a hack to re-use the @gitlab-workhorse block
-    error_page 418 = @gitlab-workhorse;
-    return 418;
-  }
-
-  location ~ ^/api/v3/projects/.*/repository/archive {
-    client_max_body_size 0;
-    # 'Error' 418 is a hack to re-use the @gitlab-workhorse block
-    error_page 418 = @gitlab-workhorse;
-    return 418;
-  }
-
-  # Build artifacts should be submitted to this location
-  location ~ ^/[\w\.-]+/[\w\.-]+/builds/download {
-    client_max_body_size 0;
-    # 'Error' 418 is a hack to re-use the @gitlab-workhorse block
-    error_page 418 = @gitlab-workhorse;
-    return 418;
-  }
-
-  # Build artifacts should be submitted to this location
-  location ~ /ci/api/v1/builds/[0-9]+/artifacts {
-    client_max_body_size 0;
-    # 'Error' 418 is a hack to re-use the @gitlab-workhorse block
-    error_page 418 = @gitlab-workhorse;
-    return 418;
-  }
-
-  location @gitlab-workhorse {
-    client_max_body_size 0;
-    ## If you use HTTPS make sure you disable gzip compression
-    ## to be safe against BREACH attack.
     gzip off;
 
     ## https://github.com/gitlabhq/gitlabhq/issues/694
@@ -216,14 +92,7 @@ server {
     proxy_connect_timeout   300;
     proxy_redirect          off;
 
-    # Do not buffer Git HTTP responses
-    proxy_buffering off;
-
-    # The following settings only work with NGINX 1.7.11 or newer
-    #
-    # # Pass chunked request bodies to gitlab-workhorse as-is
-    # proxy_request_buffering off;
-    # proxy_http_version 1.1;
+    proxy_http_version 1.1;
 
     proxy_set_header    Host                $http_host;
     proxy_set_header    X-Real-IP           $remote_addr;
@@ -232,18 +101,4 @@ server {
     proxy_set_header    X-Forwarded-Proto   $scheme;
     proxy_pass http://gitlab-workhorse;
   }
-
-  ## Enable gzip compression as per rails guide:
-  ## http://guides.rubyonrails.org/asset_pipeline.html#gzip-compression
-  ## WARNING: If you are using relative urls remove the block below
-  ## See config/application.rb under "Relative url support" for the list of
-  ## other files that need to be changed for relative url support
-  location ~ ^/(assets)/ {
-    root /home/git/gitlab/public;
-    gzip_static on; # to serve pre-gzipped version
-    expires max;
-    add_header Cache-Control public;
-  }
-
-  error_page 502 /502.html;
 }
-- 
cgit v1.2.1


From 3efae53bd79db118463bfaeceb209bc91f63bd0b Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Fri, 11 Dec 2015 23:17:36 -0800
Subject: Add open_issues_count to project API

This is needed to support Huboard and a generally useful value.
---
 lib/api/entities.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib')

diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 81bf7a8222b..014116ef130 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -68,6 +68,7 @@ module API
       expose :forked_from_project, using: Entities::ForkedFromProject, if: lambda{ | project, options | project.forked? }
       expose :avatar_url
       expose :star_count, :forks_count
+      expose :open_issues_count, if: lambda { | project, options | project.issues_enabled? && project.default_issues_tracker? }
     end
 
     class ProjectMember < UserBasic
-- 
cgit v1.2.1


From f8bf6c4b2c5fb41ae92df09b9f968d5d5d61bb2b Mon Sep 17 00:00:00 2001
From: Drew Blessing <drew@gitlab.com>
Date: Fri, 11 Dec 2015 17:27:20 -0600
Subject: [ci skip] Add user repository integrity check rake task

---
 lib/tasks/gitlab/check.rake | 56 +++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 52 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index a25fac62cfc..167b0112666 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -822,10 +822,27 @@ namespace :gitlab do
 
       namespace_dirs.each do |namespace_dir|
         repo_dirs = Dir.glob(File.join(namespace_dir, '*'))
-        repo_dirs.each do |dir|
-          puts "\nChecking repo at #{dir}"
-          system(*%W(#{Gitlab.config.git.bin_path} fsck), chdir: dir)
-        end
+        repo_dirs.each { |repo_dir| check_repo_integrity(repo_dir) }
+      end
+    end
+  end
+
+  namespace :user do
+    desc "GitLab | Check the integrity of a specific user's repositories"
+    task :check_repos, [:username] => :environment do |t, args|
+      username = args[:username] || prompt("Check repository integrity for which username? ".blue)
+      user = User.find_by(username: username)
+      if user
+        repo_dirs = user.authorized_projects.map do |p|
+                      File.join(
+                        Gitlab.config.gitlab_shell.repos_path,
+                        "#{p.path_with_namespace}.git"
+                      )
+                    end
+
+        repo_dirs.each { |repo_dir| check_repo_integrity(repo_dir) }
+      else
+        puts "\nUser '#{username}' not found".red
       end
     end
   end
@@ -952,4 +969,35 @@ namespace :gitlab do
       false
     end
   end
+
+  def check_repo_integrity(repo_dir)
+    puts "\nChecking repo at #{repo_dir.yellow}"
+
+    git_fsck(repo_dir)
+    check_config_lock(repo_dir)
+    check_ref_locks(repo_dir)
+  end
+
+  def git_fsck(repo_dir)
+    puts "Running `git fsck`".yellow
+    system(*%W(#{Gitlab.config.git.bin_path} fsck), chdir: repo_dir)
+  end
+
+  def check_config_lock(repo_dir)
+    config_exists = File.exist?(File.join(repo_dir,'config.lock'))
+    config_output = config_exists ? 'yes'.red : 'no'.green
+    puts "'config.lock' file exists?".yellow + " ... #{config_output}"
+  end
+
+  def check_ref_locks(repo_dir)
+    lock_files = Dir.glob(File.join(repo_dir,'refs/heads/*.lock'))
+    if lock_files.present?
+      puts "Ref lock files exist:".red
+      lock_files.each do |lock_file|
+        puts "  #{lock_file}"
+      end
+    else
+      puts "No ref lock files exist".green
+    end
+  end
 end
-- 
cgit v1.2.1


From b5291f95996743067bbec5a32f9c6cf0d34b36c7 Mon Sep 17 00:00:00 2001
From: Gabriel Mazetto <gabriel@gitlab.com>
Date: Tue, 15 Dec 2015 00:53:52 -0200
Subject: Fixed Rubocop offenses

---
 lib/api/entities.rb                                    | 2 +-
 lib/gitlab/backend/shell.rb                            | 2 +-
 lib/gitlab/bitbucket_import/project_creator.rb         | 3 ++-
 lib/gitlab/diff/file.rb                                | 4 ++--
 lib/gitlab/fogbugz_import/importer.rb                  | 2 +-
 lib/gitlab/fogbugz_import/project_creator.rb           | 3 ++-
 lib/gitlab/gitlab_import/project_creator.rb            | 3 ++-
 lib/gitlab/gitorious_import/project_creator.rb         | 3 ++-
 lib/gitlab/google_code_import/importer.rb              | 6 +++---
 lib/gitlab/google_code_import/project_creator.rb       | 3 ++-
 lib/gitlab/markdown/filter/markdown_filter.rb          | 2 +-
 lib/gitlab/markdown/filter/table_of_contents_filter.rb | 2 +-
 lib/rouge/formatters/html_gitlab.rb                    | 2 +-
 13 files changed, 21 insertions(+), 16 deletions(-)

(limited to 'lib')

diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index b1cd80bdf65..a5daa45faf0 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -67,7 +67,7 @@ module API
       expose :shared_runners_enabled
       expose :creator_id
       expose :namespace
-      expose :forked_from_project, using: Entities::ForkedFromProject, if: lambda{ | project, options | project.forked? }
+      expose :forked_from_project, using: Entities::ForkedFromProject, if: lambda{ |project, options| project.forked? }
       expose :avatar_url
       expose :star_count, :forks_count
     end
diff --git a/lib/gitlab/backend/shell.rb b/lib/gitlab/backend/shell.rb
index 87ac30b5ffe..459e3d6bcdb 100644
--- a/lib/gitlab/backend/shell.rb
+++ b/lib/gitlab/backend/shell.rb
@@ -2,7 +2,7 @@ module Gitlab
   class Shell
     class Error < StandardError; end
 
-    class KeyAdder < Struct.new(:io)
+    KeyAdder = Struct.new(:io) do
       def add_key(id, key)
         key.gsub!(/[[:space:]]+/, ' ').strip!
         io.puts("#{id}\t#{key}")
diff --git a/lib/gitlab/bitbucket_import/project_creator.rb b/lib/gitlab/bitbucket_import/project_creator.rb
index 35e34d033e0..03aac1a025a 100644
--- a/lib/gitlab/bitbucket_import/project_creator.rb
+++ b/lib/gitlab/bitbucket_import/project_creator.rb
@@ -11,7 +11,8 @@ module Gitlab
       end
 
       def execute
-        project = ::Projects::CreateService.new(current_user,
+        project = ::Projects::CreateService.new(
+          current_user,
           name: repo["name"],
           path: repo["slug"],
           description: repo["description"],
diff --git a/lib/gitlab/diff/file.rb b/lib/gitlab/diff/file.rb
index 142058aa69d..79061cd0141 100644
--- a/lib/gitlab/diff/file.rb
+++ b/lib/gitlab/diff/file.rb
@@ -46,11 +46,11 @@ module Gitlab
       end
 
       def added_lines
-        diff_lines.select(&:added?).size
+        diff_lines.count(&:added?)
       end
 
       def removed_lines
-        diff_lines.select(&:removed?).size
+        diff_lines.count(&:removed?)
       end
     end
   end
diff --git a/lib/gitlab/fogbugz_import/importer.rb b/lib/gitlab/fogbugz_import/importer.rb
index 496256700b8..403ebeec474 100644
--- a/lib/gitlab/fogbugz_import/importer.rb
+++ b/lib/gitlab/fogbugz_import/importer.rb
@@ -199,7 +199,7 @@ module Gitlab
         s = s.gsub(/^#/, "\\#")
         s = s.gsub(/^-/, "\\-")
         s = s.gsub("`", "\\~")
-        s = s.gsub("\r", "")
+        s = s.delete("\r")
         s = s.gsub("\n", "  \n")
         s
       end
diff --git a/lib/gitlab/fogbugz_import/project_creator.rb b/lib/gitlab/fogbugz_import/project_creator.rb
index 8b1b6f48ed5..e0163499e30 100644
--- a/lib/gitlab/fogbugz_import/project_creator.rb
+++ b/lib/gitlab/fogbugz_import/project_creator.rb
@@ -12,7 +12,8 @@ module Gitlab
       end
 
       def execute
-        project = ::Projects::CreateService.new(current_user,
+        project = ::Projects::CreateService.new(
+          current_user,
           name: repo.safe_name,
           path: repo.path,
           namespace: namespace,
diff --git a/lib/gitlab/gitlab_import/project_creator.rb b/lib/gitlab/gitlab_import/project_creator.rb
index d9452de6a50..7baaadb813c 100644
--- a/lib/gitlab/gitlab_import/project_creator.rb
+++ b/lib/gitlab/gitlab_import/project_creator.rb
@@ -11,7 +11,8 @@ module Gitlab
       end
 
       def execute
-        project = ::Projects::CreateService.new(current_user,
+        project = ::Projects::CreateService.new(
+          current_user,
           name: repo["name"],
           path: repo["path"],
           description: repo["description"],
diff --git a/lib/gitlab/gitorious_import/project_creator.rb b/lib/gitlab/gitorious_import/project_creator.rb
index cc9a91c91f4..8e22aa9286d 100644
--- a/lib/gitlab/gitorious_import/project_creator.rb
+++ b/lib/gitlab/gitorious_import/project_creator.rb
@@ -10,7 +10,8 @@ module Gitlab
       end
 
       def execute
-        ::Projects::CreateService.new(current_user,
+        ::Projects::CreateService.new(
+          current_user,
           name: repo.name,
           path: repo.path,
           description: repo.description,
diff --git a/lib/gitlab/google_code_import/importer.rb b/lib/gitlab/google_code_import/importer.rb
index 87fee28dc01..62da327931f 100644
--- a/lib/gitlab/google_code_import/importer.rb
+++ b/lib/gitlab/google_code_import/importer.rb
@@ -171,8 +171,6 @@ module Gitlab
         when /\AMilestone:/
           "#fee3ff"
 
-        when *@closed_statuses.map { |s| nice_status_name(s) }
-          "#cfcfcf"
         when "Status: New"
           "#428bca"
         when "Status: Accepted"
@@ -199,6 +197,8 @@ module Gitlab
           "#8e44ad"
         when "Type: Other"
           "#7f8c8d"
+        when *@closed_statuses.map { |s| nice_status_name(s) }
+          "#cfcfcf"
         else
           "#e2e2e2"
         end
@@ -227,7 +227,7 @@ module Gitlab
         s = s.gsub("`", "\\`")
 
         # Carriage returns make me sad
-        s = s.gsub("\r", "")
+        s = s.delete("\r")
 
         # Markdown ignores single newlines, but we need them as <br />.
         s = s.gsub("\n", "  \n")
diff --git a/lib/gitlab/google_code_import/project_creator.rb b/lib/gitlab/google_code_import/project_creator.rb
index 1cb7d16aeb3..87821c23460 100644
--- a/lib/gitlab/google_code_import/project_creator.rb
+++ b/lib/gitlab/google_code_import/project_creator.rb
@@ -11,7 +11,8 @@ module Gitlab
       end
 
       def execute
-        project = ::Projects::CreateService.new(current_user,
+        project = ::Projects::CreateService.new(
+          current_user,
           name: repo.name,
           path: repo.name,
           description: repo.summary,
diff --git a/lib/gitlab/markdown/filter/markdown_filter.rb b/lib/gitlab/markdown/filter/markdown_filter.rb
index 921e2a0794e..b1b974fcc70 100644
--- a/lib/gitlab/markdown/filter/markdown_filter.rb
+++ b/lib/gitlab/markdown/filter/markdown_filter.rb
@@ -3,7 +3,7 @@ module Gitlab
     class MarkdownFilter < HTML::Pipeline::TextFilter
       def initialize(text, context = nil, result = nil)
         super text, context, result
-        @text = @text.gsub "\r", ''
+        @text = @text.delete "\r"
       end
 
       def call
diff --git a/lib/gitlab/markdown/filter/table_of_contents_filter.rb b/lib/gitlab/markdown/filter/table_of_contents_filter.rb
index bbb3bf7fc8b..6be644b0f67 100644
--- a/lib/gitlab/markdown/filter/table_of_contents_filter.rb
+++ b/lib/gitlab/markdown/filter/table_of_contents_filter.rb
@@ -31,7 +31,7 @@ module Gitlab
 
           id = text.downcase
           id.gsub!(PUNCTUATION_REGEXP, '') # remove punctuation
-          id.gsub!(' ', '-') # replace spaces with dash
+          id.tr!(' ', '-') # replace spaces with dash
           id.squeeze!('-') # replace multiple dashes with one
 
           uniq = (headers[id] > 0) ? "-#{headers[id]}" : ''
diff --git a/lib/rouge/formatters/html_gitlab.rb b/lib/rouge/formatters/html_gitlab.rb
index 6762ca47c32..8c309efc7b8 100644
--- a/lib/rouge/formatters/html_gitlab.rb
+++ b/lib/rouge/formatters/html_gitlab.rb
@@ -39,7 +39,7 @@ module Rouge
           lineanchorsid: 'L',
           anchorlinenos: false,
           inline_theme: nil
-        )
+      )
         @nowrap = nowrap
         @cssclass = cssclass
         @linenos = linenos
-- 
cgit v1.2.1


From 8e3f1fa629a61741282214b293c1bc9438aada59 Mon Sep 17 00:00:00 2001
From: tduehr <tduehr@gmail.com>
Date: Wed, 11 Nov 2015 22:25:31 -0600
Subject: add CAS authentication support

---
 lib/gitlab/o_auth/session.rb | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 lib/gitlab/o_auth/session.rb

(limited to 'lib')

diff --git a/lib/gitlab/o_auth/session.rb b/lib/gitlab/o_auth/session.rb
new file mode 100644
index 00000000000..f33bfd0bd0e
--- /dev/null
+++ b/lib/gitlab/o_auth/session.rb
@@ -0,0 +1,17 @@
+module Gitlab
+  module OAuth
+    module Session
+      def self.create(provider, ticket)
+        Rails.cache.write("gitlab:#{provider}:#{ticket}", ticket, expires_in: Gitlab.config.omniauth.cas3.session_duration)
+      end
+
+      def self.destroy(provider, ticket)
+        Rails.cache.delete("gitlab:#{provider}:#{ticket}")
+      end
+
+      def self.valid?(provider, ticket)
+        Rails.cache.read("gitlab:#{provider}:#{ticket}").present?
+      end
+    end
+  end
+end
-- 
cgit v1.2.1


From 7781bda9bd82997f4a03de4cf911b1156ceb2cde Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Tue, 15 Dec 2015 15:51:16 +0100
Subject: Move Markdown/reference logic from Gitlab::Markdown to Banzai

---
 lib/banzai.rb                                      |  13 ++
 lib/banzai/cross_project_reference.rb              |  22 +++
 lib/banzai/filter.rb                               |  10 +
 lib/banzai/filter/abstract_reference_filter.rb     | 145 ++++++++++++++
 lib/banzai/filter/autolink_filter.rb               | 107 +++++++++++
 lib/banzai/filter/commit_range_reference_filter.rb |  58 ++++++
 lib/banzai/filter/commit_reference_filter.rb       |  63 ++++++
 lib/banzai/filter/emoji_filter.rb                  |  80 ++++++++
 .../filter/external_issue_reference_filter.rb      |  69 +++++++
 lib/banzai/filter/external_link_filter.rb          |  34 ++++
 lib/banzai/filter/issue_reference_filter.rb        |  23 +++
 lib/banzai/filter/label_reference_filter.rb        |  96 ++++++++++
 lib/banzai/filter/markdown_filter.rb               |  42 ++++
 .../filter/merge_request_reference_filter.rb       |  41 ++++
 lib/banzai/filter/redactor_filter.rb               |  43 +++++
 lib/banzai/filter/reference_filter.rb              | 190 +++++++++++++++++++
 lib/banzai/filter/reference_gatherer_filter.rb     |  62 ++++++
 lib/banzai/filter/relative_link_filter.rb          | 157 +++++++++++++++
 lib/banzai/filter/sanitization_filter.rb           |  99 ++++++++++
 lib/banzai/filter/snippet_reference_filter.rb      |  25 +++
 lib/banzai/filter/syntax_highlight_filter.rb       |  45 +++++
 lib/banzai/filter/table_of_contents_filter.rb      |  63 ++++++
 lib/banzai/filter/task_list_filter.rb              |  24 +++
 lib/banzai/filter/upload_link_filter.rb            |  47 +++++
 lib/banzai/filter/user_reference_filter.rb         | 129 +++++++++++++
 lib/banzai/lazy_reference.rb                       |  27 +++
 lib/banzai/pipeline.rb                             |  10 +
 lib/banzai/pipeline/asciidoc_pipeline.rb           |  13 ++
 lib/banzai/pipeline/atom_pipeline.rb               |  14 ++
 lib/banzai/pipeline/base_pipeline.rb               |  30 +++
 lib/banzai/pipeline/combined_pipeline.rb           |  27 +++
 lib/banzai/pipeline/description_pipeline.rb        |  14 ++
 lib/banzai/pipeline/email_pipeline.rb              |  13 ++
 lib/banzai/pipeline/full_pipeline.rb               |   9 +
 lib/banzai/pipeline/gfm_pipeline.rb                |  41 ++++
 lib/banzai/pipeline/note_pipeline.rb               |  14 ++
 lib/banzai/pipeline/plain_markdown_pipeline.rb     |  13 ++
 lib/banzai/pipeline/post_process_pipeline.rb       |  20 ++
 .../pipeline/reference_extraction_pipeline.rb      |  13 ++
 lib/banzai/pipeline/single_line_pipeline.rb        |   9 +
 lib/banzai/reference_extractor.rb                  |  55 ++++++
 lib/banzai/renderer.rb                             |  76 ++++++++
 lib/gitlab/asciidoc.rb                             |   2 +-
 lib/gitlab/markdown.rb                             | 115 -----------
 lib/gitlab/markdown/abstract_reference_filter.rb   | 145 --------------
 lib/gitlab/markdown/combined_pipeline.rb           |  27 ---
 lib/gitlab/markdown/cross_project_reference.rb     |  24 ---
 lib/gitlab/markdown/filter/autolink_filter.rb      | 107 -----------
 .../filter/commit_range_reference_filter.rb        |  58 ------
 .../markdown/filter/commit_reference_filter.rb     |  63 ------
 lib/gitlab/markdown/filter/emoji_filter.rb         |  80 --------
 .../filter/external_issue_reference_filter.rb      |  69 -------
 lib/gitlab/markdown/filter/external_link_filter.rb |  34 ----
 .../markdown/filter/issue_reference_filter.rb      |  23 ---
 .../markdown/filter/label_reference_filter.rb      |  96 ----------
 lib/gitlab/markdown/filter/markdown_filter.rb      |  39 ----
 .../filter/merge_request_reference_filter.rb       |  41 ----
 lib/gitlab/markdown/filter/redactor_filter.rb      |  43 -----
 .../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       | 129 -------------
 lib/gitlab/markdown/pipeline.rb                    |   4 +-
 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/reference_filter.rb            | 211 ---------------------
 lib/gitlab/reference_extractor.rb                  |  53 +-----
 81 files changed, 2097 insertions(+), 2047 deletions(-)
 create mode 100644 lib/banzai.rb
 create mode 100644 lib/banzai/cross_project_reference.rb
 create mode 100644 lib/banzai/filter.rb
 create mode 100644 lib/banzai/filter/abstract_reference_filter.rb
 create mode 100644 lib/banzai/filter/autolink_filter.rb
 create mode 100644 lib/banzai/filter/commit_range_reference_filter.rb
 create mode 100644 lib/banzai/filter/commit_reference_filter.rb
 create mode 100644 lib/banzai/filter/emoji_filter.rb
 create mode 100644 lib/banzai/filter/external_issue_reference_filter.rb
 create mode 100644 lib/banzai/filter/external_link_filter.rb
 create mode 100644 lib/banzai/filter/issue_reference_filter.rb
 create mode 100644 lib/banzai/filter/label_reference_filter.rb
 create mode 100644 lib/banzai/filter/markdown_filter.rb
 create mode 100644 lib/banzai/filter/merge_request_reference_filter.rb
 create mode 100644 lib/banzai/filter/redactor_filter.rb
 create mode 100644 lib/banzai/filter/reference_filter.rb
 create mode 100644 lib/banzai/filter/reference_gatherer_filter.rb
 create mode 100644 lib/banzai/filter/relative_link_filter.rb
 create mode 100644 lib/banzai/filter/sanitization_filter.rb
 create mode 100644 lib/banzai/filter/snippet_reference_filter.rb
 create mode 100644 lib/banzai/filter/syntax_highlight_filter.rb
 create mode 100644 lib/banzai/filter/table_of_contents_filter.rb
 create mode 100644 lib/banzai/filter/task_list_filter.rb
 create mode 100644 lib/banzai/filter/upload_link_filter.rb
 create mode 100644 lib/banzai/filter/user_reference_filter.rb
 create mode 100644 lib/banzai/lazy_reference.rb
 create mode 100644 lib/banzai/pipeline.rb
 create mode 100644 lib/banzai/pipeline/asciidoc_pipeline.rb
 create mode 100644 lib/banzai/pipeline/atom_pipeline.rb
 create mode 100644 lib/banzai/pipeline/base_pipeline.rb
 create mode 100644 lib/banzai/pipeline/combined_pipeline.rb
 create mode 100644 lib/banzai/pipeline/description_pipeline.rb
 create mode 100644 lib/banzai/pipeline/email_pipeline.rb
 create mode 100644 lib/banzai/pipeline/full_pipeline.rb
 create mode 100644 lib/banzai/pipeline/gfm_pipeline.rb
 create mode 100644 lib/banzai/pipeline/note_pipeline.rb
 create mode 100644 lib/banzai/pipeline/plain_markdown_pipeline.rb
 create mode 100644 lib/banzai/pipeline/post_process_pipeline.rb
 create mode 100644 lib/banzai/pipeline/reference_extraction_pipeline.rb
 create mode 100644 lib/banzai/pipeline/single_line_pipeline.rb
 create mode 100644 lib/banzai/reference_extractor.rb
 create mode 100644 lib/banzai/renderer.rb
 delete mode 100644 lib/gitlab/markdown.rb
 delete mode 100644 lib/gitlab/markdown/abstract_reference_filter.rb
 delete mode 100644 lib/gitlab/markdown/combined_pipeline.rb
 delete mode 100644 lib/gitlab/markdown/cross_project_reference.rb
 delete mode 100644 lib/gitlab/markdown/filter/autolink_filter.rb
 delete mode 100644 lib/gitlab/markdown/filter/commit_range_reference_filter.rb
 delete mode 100644 lib/gitlab/markdown/filter/commit_reference_filter.rb
 delete mode 100644 lib/gitlab/markdown/filter/emoji_filter.rb
 delete mode 100644 lib/gitlab/markdown/filter/external_issue_reference_filter.rb
 delete mode 100644 lib/gitlab/markdown/filter/external_link_filter.rb
 delete mode 100644 lib/gitlab/markdown/filter/issue_reference_filter.rb
 delete mode 100644 lib/gitlab/markdown/filter/label_reference_filter.rb
 delete mode 100644 lib/gitlab/markdown/filter/markdown_filter.rb
 delete mode 100644 lib/gitlab/markdown/filter/merge_request_reference_filter.rb
 delete mode 100644 lib/gitlab/markdown/filter/redactor_filter.rb
 delete mode 100644 lib/gitlab/markdown/filter/reference_gatherer_filter.rb
 delete mode 100644 lib/gitlab/markdown/filter/relative_link_filter.rb
 delete mode 100644 lib/gitlab/markdown/filter/sanitization_filter.rb
 delete mode 100644 lib/gitlab/markdown/filter/snippet_reference_filter.rb
 delete mode 100644 lib/gitlab/markdown/filter/syntax_highlight_filter.rb
 delete mode 100644 lib/gitlab/markdown/filter/table_of_contents_filter.rb
 delete mode 100644 lib/gitlab/markdown/filter/task_list_filter.rb
 delete mode 100644 lib/gitlab/markdown/filter/upload_link_filter.rb
 delete mode 100644 lib/gitlab/markdown/filter/user_reference_filter.rb
 delete mode 100644 lib/gitlab/markdown/pipeline/asciidoc_pipeline.rb
 delete mode 100644 lib/gitlab/markdown/pipeline/atom_pipeline.rb
 delete mode 100644 lib/gitlab/markdown/pipeline/description_pipeline.rb
 delete mode 100644 lib/gitlab/markdown/pipeline/email_pipeline.rb
 delete mode 100644 lib/gitlab/markdown/pipeline/full_pipeline.rb
 delete mode 100644 lib/gitlab/markdown/pipeline/gfm_pipeline.rb
 delete mode 100644 lib/gitlab/markdown/pipeline/note_pipeline.rb
 delete mode 100644 lib/gitlab/markdown/pipeline/plain_markdown_pipeline.rb
 delete mode 100644 lib/gitlab/markdown/pipeline/post_process_pipeline.rb
 delete mode 100644 lib/gitlab/markdown/pipeline/reference_extraction_pipeline.rb
 delete mode 100644 lib/gitlab/markdown/pipeline/single_line_pipeline.rb
 delete mode 100644 lib/gitlab/markdown/reference_filter.rb

(limited to 'lib')

diff --git a/lib/banzai.rb b/lib/banzai.rb
new file mode 100644
index 00000000000..093382261ae
--- /dev/null
+++ b/lib/banzai.rb
@@ -0,0 +1,13 @@
+module Banzai
+  def self.render(text, context = {})
+    Renderer.render(text, context)
+  end
+
+  def self.render_result(text, context = {})
+    Renderer.render_result(text, context)
+  end
+
+  def self.post_process(html, context)
+    Renderer.post_process(html, context)
+  end
+end
diff --git a/lib/banzai/cross_project_reference.rb b/lib/banzai/cross_project_reference.rb
new file mode 100644
index 00000000000..ba2866e1efa
--- /dev/null
+++ b/lib/banzai/cross_project_reference.rb
@@ -0,0 +1,22 @@
+require 'banzai'
+
+module Banzai
+  # Common methods for ReferenceFilters that support an optional cross-project
+  # reference.
+  module CrossProjectReference
+    # Given a cross-project reference string, get the Project record
+    #
+    # Defaults to value of `context[:project]` if:
+    # * No reference is given OR
+    # * Reference given doesn't exist
+    #
+    # ref - String reference.
+    #
+    # Returns a Project, or nil if the reference can't be found
+    def project_from_ref(ref)
+      return context[:project] unless ref
+
+      Project.find_with_namespace(ref)
+    end
+  end
+end
diff --git a/lib/banzai/filter.rb b/lib/banzai/filter.rb
new file mode 100644
index 00000000000..fd4fe024252
--- /dev/null
+++ b/lib/banzai/filter.rb
@@ -0,0 +1,10 @@
+require 'active_support/core_ext/string/output_safety'
+require 'banzai'
+
+module Banzai
+  module Filter
+    def self.[](name)
+      const_get("#{name.to_s.camelize}Filter")
+    end
+  end
+end
diff --git a/lib/banzai/filter/abstract_reference_filter.rb b/lib/banzai/filter/abstract_reference_filter.rb
new file mode 100644
index 00000000000..bdaa4721b4b
--- /dev/null
+++ b/lib/banzai/filter/abstract_reference_filter.rb
@@ -0,0 +1,145 @@
+require 'banzai'
+
+module Banzai
+  module Filter
+    # Issues, Merge Requests, Snippets, Commits and Commit Ranges share
+    # similar functionality in reference filtering.
+    class AbstractReferenceFilter < ReferenceFilter
+      include CrossProjectReference
+
+      def self.object_class
+        # Implement in child class
+        # Example: MergeRequest
+      end
+
+      def self.object_name
+        object_class.name.underscore
+      end
+
+      def self.object_sym
+        object_name.to_sym
+      end
+
+      def self.data_reference
+        "data-#{object_name.dasherize}"
+      end
+
+      # Public: Find references in text (like `!123` for merge requests)
+      #
+      #   AnyReferenceFilter.references_in(text) do |match, id, project_ref, matches|
+      #     object = find_object(project_ref, id)
+      #     "<a href=...>#{object.to_reference}</a>"
+      #   end
+      #
+      # text - String text to search.
+      #
+      # Yields the String match, the Integer referenced object ID, an optional String
+      # of the external project reference, and all of the matchdata.
+      #
+      # Returns a String replaced with the return of the block.
+      def self.references_in(text, pattern = object_class.reference_pattern)
+        text.gsub(pattern) do |match|
+          yield match, $~[object_sym].to_i, $~[:project], $~
+        end
+      end
+
+      def self.referenced_by(node)
+        { object_sym => LazyReference.new(object_class, node.attr(data_reference)) }
+      end
+
+      delegate :object_class, :object_sym, :references_in, to: :class
+
+      def find_object(project, id)
+        # Implement in child class
+        # Example: project.merge_requests.find
+      end
+
+      def url_for_object(object, project)
+        # Implement in child class
+        # Example: project_merge_request_url
+      end
+
+      def call
+        # `#123`
+        replace_text_nodes_matching(object_class.reference_pattern) do |content|
+          object_link_filter(content, object_class.reference_pattern)
+        end
+
+        # `[Issue](#123)`, which is turned into
+        # `<a href="#123">Issue</a>`
+        replace_link_nodes_with_href(object_class.reference_pattern) do |link, text|
+          object_link_filter(link, object_class.reference_pattern, link_text: text)
+        end
+
+        # `http://gitlab.example.com/namespace/project/issues/123`, which is turned into
+        # `<a href="http://gitlab.example.com/namespace/project/issues/123">http://gitlab.example.com/namespace/project/issues/123</a>`
+        replace_link_nodes_with_text(object_class.link_reference_pattern) do |text|
+          object_link_filter(text, object_class.link_reference_pattern)
+        end
+
+        # `[Issue](http://gitlab.example.com/namespace/project/issues/123)`, which is turned into
+        # `<a href="http://gitlab.example.com/namespace/project/issues/123">Issue</a>`
+        replace_link_nodes_with_href(object_class.link_reference_pattern) do |link, text|
+          object_link_filter(link, object_class.link_reference_pattern, link_text: text)
+        end
+      end
+
+      # Replace references (like `!123` for merge requests) in text with links
+      # to the referenced object's details page.
+      #
+      # text - String text to replace references in.
+      # pattern - Reference pattern to match against.
+      # link_text - Original content of the link being replaced.
+      #
+      # Returns a String with references replaced with links. All links
+      # have `gfm` and `gfm-OBJECT_NAME` class names attached for styling.
+      def object_link_filter(text, pattern, link_text: nil)
+        references_in(text, pattern) do |match, id, project_ref, matches|
+          project = project_from_ref(project_ref)
+
+          if project && object = find_object(project, id)
+            title = escape_once(object_link_title(object))
+            klass = reference_class(object_sym)
+
+            data  = data_attribute(
+              original:     link_text || match,
+              project:      project.id,
+              object_sym => object.id
+            )
+
+            url = matches[:url] if matches.names.include?("url")
+            url ||= url_for_object(object, project)
+
+            text = link_text
+            unless text
+              text = object.reference_link_text(context[:project])
+
+              extras = object_link_text_extras(object, matches)
+              text += " (#{extras.join(", ")})" if extras.any?
+            end
+
+            %(<a href="#{url}" #{data}
+                 title="#{title}"
+                 class="#{klass}">#{text}</a>)
+          else
+            match
+          end
+        end
+      end
+
+      def object_link_text_extras(object, matches)
+        extras = []
+
+        if matches.names.include?("anchor") && matches[:anchor] && matches[:anchor] =~ /\A\#note_(\d+)\z/
+          extras << "comment #{$1}"
+        end
+
+        extras
+      end
+
+      def object_link_title(object)
+        "#{object_class.name.titleize}: #{object.title}"
+      end
+    end
+  end
+end
diff --git a/lib/banzai/filter/autolink_filter.rb b/lib/banzai/filter/autolink_filter.rb
new file mode 100644
index 00000000000..da4ee80c1b5
--- /dev/null
+++ b/lib/banzai/filter/autolink_filter.rb
@@ -0,0 +1,107 @@
+require 'banzai'
+require 'html/pipeline/filter'
+require 'uri'
+
+module Banzai
+  module Filter
+    # 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/banzai/filter/commit_range_reference_filter.rb b/lib/banzai/filter/commit_range_reference_filter.rb
new file mode 100644
index 00000000000..e67cd45ab9b
--- /dev/null
+++ b/lib/banzai/filter/commit_range_reference_filter.rb
@@ -0,0 +1,58 @@
+require 'banzai'
+
+module Banzai
+  module Filter
+    # HTML filter that replaces commit range references with links.
+    #
+    # This filter supports cross-project references.
+    class CommitRangeReferenceFilter < AbstractReferenceFilter
+      def self.object_class
+        CommitRange
+      end
+
+      def self.references_in(text, pattern = CommitRange.reference_pattern)
+        text.gsub(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 = find_object(project, id)
+
+        return unless range
+
+        { commit_range: range }
+      end
+
+      def initialize(*args)
+        super
+
+        @commit_map = {}
+      end
+
+      def self.find_object(project, id)
+        range = CommitRange.new(id, project)
+
+        range.valid_commits? ? range : nil
+      end
+
+      def find_object(*args)
+        self.class.find_object(*args)
+      end
+
+      def url_for_object(range, project)
+        h = Gitlab::Application.routes.url_helpers
+        h.namespace_project_compare_url(project.namespace, project,
+                                        range.to_param.merge(only_path: context[:only_path]))
+      end
+
+      def object_link_title(range)
+        range.reference_title
+      end
+    end
+  end
+end
diff --git a/lib/banzai/filter/commit_reference_filter.rb b/lib/banzai/filter/commit_reference_filter.rb
new file mode 100644
index 00000000000..9e57608b483
--- /dev/null
+++ b/lib/banzai/filter/commit_reference_filter.rb
@@ -0,0 +1,63 @@
+require 'banzai'
+
+module Banzai
+  module Filter
+    # HTML filter that replaces commit references with links.
+    #
+    # This filter supports cross-project references.
+    class CommitReferenceFilter < AbstractReferenceFilter
+      def self.object_class
+        Commit
+      end
+
+      def self.references_in(text, pattern = Commit.reference_pattern)
+        text.gsub(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 = find_object(project, id)
+
+        return unless commit
+
+        { commit: commit }
+      end
+
+      def self.find_object(project, id)
+        if project && project.valid_repo?
+          project.commit(id)
+        end
+      end
+
+      def find_object(*args)
+        self.class.find_object(*args)
+      end
+
+      def url_for_object(commit, project)
+        h = Gitlab::Application.routes.url_helpers
+        h.namespace_project_commit_url(project.namespace, project, commit,
+                                        only_path: context[:only_path])
+      end
+
+      def object_link_title(commit)
+        commit.link_title
+      end
+
+      def object_link_text_extras(object, matches)
+        extras = super
+
+        path = matches[:path] if matches.names.include?("path")
+        if path == '/builds'
+          extras.unshift "builds"
+        end
+
+        extras
+      end
+    end
+  end
+end
diff --git a/lib/banzai/filter/emoji_filter.rb b/lib/banzai/filter/emoji_filter.rb
new file mode 100644
index 00000000000..86838e1483c
--- /dev/null
+++ b/lib/banzai/filter/emoji_filter.rb
@@ -0,0 +1,80 @@
+require 'action_controller'
+require 'banzai'
+require 'gitlab_emoji'
+require 'html/pipeline/filter'
+
+module Banzai
+  module Filter
+    # 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/banzai/filter/external_issue_reference_filter.rb b/lib/banzai/filter/external_issue_reference_filter.rb
new file mode 100644
index 00000000000..f5737a7ac19
--- /dev/null
+++ b/lib/banzai/filter/external_issue_reference_filter.rb
@@ -0,0 +1,69 @@
+require 'banzai'
+
+module Banzai
+  module Filter
+    # 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
+
+        replace_link_nodes_with_href(ExternalIssue.reference_pattern) do |link, text|
+          issue_link_filter(link, link_text: text)
+        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, link_text: nil)
+        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)
+
+          text = link_text || match
+
+          %(<a href="#{url}" #{data}
+               title="#{title}"
+               class="#{klass}">#{text}</a>)
+        end
+      end
+
+      def url_for_issue(*args)
+        IssuesHelper.url_for_issue(*args)
+      end
+    end
+  end
+end
diff --git a/lib/banzai/filter/external_link_filter.rb b/lib/banzai/filter/external_link_filter.rb
new file mode 100644
index 00000000000..ac87b9820af
--- /dev/null
+++ b/lib/banzai/filter/external_link_filter.rb
@@ -0,0 +1,34 @@
+require 'banzai'
+require 'html/pipeline/filter'
+
+module Banzai
+  module Filter
+    # HTML Filter to add a `rel="nofollow"` attribute to external links
+    #
+    class ExternalLinkFilter < HTML::Pipeline::Filter
+      def call
+        doc.search('a').each do |node|
+          link = node.attr('href')
+
+          next unless link
+
+          # 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/banzai/filter/issue_reference_filter.rb b/lib/banzai/filter/issue_reference_filter.rb
new file mode 100644
index 00000000000..51180cb901a
--- /dev/null
+++ b/lib/banzai/filter/issue_reference_filter.rb
@@ -0,0 +1,23 @@
+require 'banzai'
+
+module Banzai
+  module Filter
+    # 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/banzai/filter/label_reference_filter.rb b/lib/banzai/filter/label_reference_filter.rb
new file mode 100644
index 00000000000..07bac2dd7fd
--- /dev/null
+++ b/lib/banzai/filter/label_reference_filter.rb
@@ -0,0 +1,96 @@
+require 'banzai'
+
+module Banzai
+  module Filter
+    # 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
+
+        replace_link_nodes_with_href(Label.reference_pattern) do |link, text|
+          label_link_filter(link, link_text: text)
+        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, link_text: nil)
+        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(
+              original: link_text || match,
+              project: project.id,
+              label: label.id
+            )
+
+            text = link_text || render_colored_label(label)
+
+            %(<a href="#{url}" #{data}
+                 class="#{klass}">#{text}</a>)
+          else
+            match
+          end
+        end
+      end
+
+      def url_for_label(project, label)
+        h = Gitlab::Application.routes.url_helpers
+        h.namespace_project_issues_url( 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/banzai/filter/markdown_filter.rb b/lib/banzai/filter/markdown_filter.rb
new file mode 100644
index 00000000000..0072bab1f99
--- /dev/null
+++ b/lib/banzai/filter/markdown_filter.rb
@@ -0,0 +1,42 @@
+require 'banzai'
+require 'html/pipeline/filter'
+
+module Banzai
+  module Filter
+    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/banzai/filter/merge_request_reference_filter.rb b/lib/banzai/filter/merge_request_reference_filter.rb
new file mode 100644
index 00000000000..755b946a34b
--- /dev/null
+++ b/lib/banzai/filter/merge_request_reference_filter.rb
@@ -0,0 +1,41 @@
+require 'banzai'
+
+module Banzai
+  module Filter
+    # 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
+
+      def object_link_text_extras(object, matches)
+        extras = super
+
+        path = matches[:path] if matches.names.include?("path")
+        case path
+        when '/diffs'
+          extras.unshift "diffs"
+        when '/commits'
+          extras.unshift "commits"
+        when '/builds'
+          extras.unshift "builds"
+        end
+
+        extras
+      end
+    end
+  end
+end
diff --git a/lib/banzai/filter/redactor_filter.rb b/lib/banzai/filter/redactor_filter.rb
new file mode 100644
index 00000000000..89e7a79789a
--- /dev/null
+++ b/lib/banzai/filter/redactor_filter.rb
@@ -0,0 +1,43 @@
+require 'banzai'
+require 'html/pipeline/filter'
+
+module Banzai
+  module Filter
+    # 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)
+            # The reference should be replaced by the original text,
+            # which is not always the same as the rendered text.
+            text = node.attr('data-original') || node.text
+            node.replace(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 = Banzai::Filter.const_get(reference_type)
+
+          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/banzai/filter/reference_filter.rb b/lib/banzai/filter/reference_filter.rb
new file mode 100644
index 00000000000..33457a3f361
--- /dev/null
+++ b/lib/banzai/filter/reference_filter.rb
@@ -0,0 +1,190 @@
+require 'active_support/core_ext/string/output_safety'
+require 'banzai'
+require 'html/pipeline/filter'
+
+module Banzai
+  module Filter
+    # Base class for GitLab Flavored Markdown reference filters.
+    #
+    # References within <pre>, <code>, <a>, and <style> elements are ignored.
+    #
+    # Context options:
+    #   :project (required) - Current project, ignored if reference is cross-project.
+    #   :only_path          - Generate path-only links.
+    class ReferenceFilter < HTML::Pipeline::Filter
+      def self.user_can_reference?(user, node, context)
+        if node.has_attribute?('data-project')
+          project_id = node.attr('data-project').to_i
+          return true if project_id == context[:project].try(:id)
+
+          project = Project.find(project_id) rescue nil
+          Ability.abilities.allowed?(user, :read_project, project)
+        else
+          true
+        end
+      end
+
+      def self.referenced_by(node)
+        raise NotImplementedError, "#{self} does not implement #{__method__}"
+      end
+
+      # Returns a data attribute String to attach to a reference link
+      #
+      # attributes - Hash, where the key becomes the data attribute name and the
+      #              value is the data attribute value
+      #
+      # Examples:
+      #
+      #   data_attribute(project: 1, issue: 2)
+      #   # => "data-reference-filter=\"SomeReferenceFilter\" data-project=\"1\" data-issue=\"2\""
+      #
+      #   data_attribute(project: 3, 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.demodulize
+        attributes.map { |key, value| %Q(data-#{key.to_s.dasherize}="#{value}") }.join(" ")
+      end
+
+      def escape_once(html)
+        ERB::Util.html_escape_once(html)
+      end
+
+      def ignore_parents
+        @ignore_parents ||= begin
+          # Don't look for references in text nodes that are children of these
+          # elements.
+          parents = %w(pre code a style)
+          parents << 'blockquote' if context[:ignore_blockquotes]
+          parents.to_set
+        end
+      end
+
+      def ignored_ancestry?(node)
+        has_ancestor?(node, ignore_parents)
+      end
+
+      def project
+        context[:project]
+      end
+
+      def reference_class(type)
+        "gfm gfm-#{type}"
+      end
+
+      # Iterate through the document's text nodes, yielding the current node's
+      # content if:
+      #
+      # * The `project` context value is present AND
+      # * The node's content matches `pattern` AND
+      # * The node is not an ancestor of an ignored node type
+      #
+      # pattern - Regex pattern against which to match the node's content
+      #
+      # Yields the current node's String contents. The result of the block will
+      # replace the node's existing content and update the current document.
+      #
+      # Returns the updated Nokogiri::HTML::DocumentFragment object.
+      def replace_text_nodes_matching(pattern)
+        return doc if project.nil?
+
+        search_text_nodes(doc).each do |node|
+          next if ignored_ancestry?(node)
+          next unless node.text =~ pattern
+
+          content = node.to_html
+
+          html = yield content
+
+          next if html == content
+
+          node.replace(html)
+        end
+
+        doc
+      end
+
+      # Iterate through the document's link nodes, yielding the current node's
+      # content if:
+      #
+      # * The `project` context value is present AND
+      # * The node's content matches `pattern`
+      #
+      # pattern - Regex pattern against which to match the node's content
+      #
+      # Yields the current node's String contents. The result of the block will
+      # replace the node and update the current document.
+      #
+      # Returns the updated Nokogiri::HTML::DocumentFragment object.
+      def replace_link_nodes_with_text(pattern)
+        return doc if project.nil?
+
+        doc.search('a').each do |node|
+          klass = node.attr('class')
+          next if klass && klass.include?('gfm')
+
+          link = node.attr('href')
+          text = node.text
+
+          next unless link && text
+
+          link = URI.decode(link)
+          # Ignore ending punctionation like periods or commas
+          next unless link == text && text =~ /\A#{pattern}/
+
+          html = yield text
+
+          next if html == text
+
+          node.replace(html)
+        end
+
+        doc
+      end
+
+      # Iterate through the document's link nodes, yielding the current node's
+      # content if:
+      #
+      # * The `project` context value is present AND
+      # * The node's HREF matches `pattern`
+      #
+      # pattern - Regex pattern against which to match the node's HREF
+      #
+      # Yields the current node's String HREF and String content.
+      # The result of the block will replace the node and update the current document.
+      #
+      # Returns the updated Nokogiri::HTML::DocumentFragment object.
+      def replace_link_nodes_with_href(pattern)
+        return doc if project.nil?
+
+        doc.search('a').each do |node|
+          klass = node.attr('class')
+          next if klass && klass.include?('gfm')
+
+          link = node.attr('href')
+          text = node.text
+
+          next unless link && text
+          link = URI.decode(link)
+          next unless link && link =~ /\A#{pattern}\z/
+
+          html = yield link, text
+
+          next if html == link
+
+          node.replace(html)
+        end
+
+        doc
+      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/banzai/filter/reference_gatherer_filter.rb b/lib/banzai/filter/reference_gatherer_filter.rb
new file mode 100644
index 00000000000..855f238ac1e
--- /dev/null
+++ b/lib/banzai/filter/reference_gatherer_filter.rb
@@ -0,0 +1,62 @@
+require 'banzai'
+require 'html/pipeline/filter'
+
+module Banzai
+  module Filter
+    # 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 ReferenceExtractor.lazy?
+
+        doc
+      end
+
+      private
+
+      def gather_references(node)
+        return unless node.has_attribute?('data-reference-filter')
+
+        reference_type = node.attr('data-reference-filter')
+        reference_filter = Banzai::Filter.const_get(reference_type)
+
+        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
+
+      def load_lazy_references
+        refs = result[:references]
+        refs.each do |type, values|
+          refs[type] = ReferenceExtractor.lazily(values)
+        end
+      end
+
+      def current_user
+        context[:current_user]
+      end
+    end
+  end
+end
diff --git a/lib/banzai/filter/relative_link_filter.rb b/lib/banzai/filter/relative_link_filter.rb
new file mode 100644
index 00000000000..5a081125f21
--- /dev/null
+++ b/lib/banzai/filter/relative_link_filter.rb
@@ -0,0 +1,157 @@
+require 'banzai'
+require 'html/pipeline/filter'
+require 'uri'
+
+module Banzai
+  module Filter
+    # 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/banzai/filter/sanitization_filter.rb b/lib/banzai/filter/sanitization_filter.rb
new file mode 100644
index 00000000000..d03e3ae4b3c
--- /dev/null
+++ b/lib/banzai/filter/sanitization_filter.rb
@@ -0,0 +1,99 @@
+require 'banzai'
+require 'html/pipeline/filter'
+require 'html/pipeline/sanitization_filter'
+
+module Banzai
+  module Filter
+    # 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/banzai/filter/snippet_reference_filter.rb b/lib/banzai/filter/snippet_reference_filter.rb
new file mode 100644
index 00000000000..1ad5df96f85
--- /dev/null
+++ b/lib/banzai/filter/snippet_reference_filter.rb
@@ -0,0 +1,25 @@
+require 'banzai'
+
+module Banzai
+  module Filter
+    # 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/banzai/filter/syntax_highlight_filter.rb b/lib/banzai/filter/syntax_highlight_filter.rb
new file mode 100644
index 00000000000..c889cc1e97c
--- /dev/null
+++ b/lib/banzai/filter/syntax_highlight_filter.rb
@@ -0,0 +1,45 @@
+require 'banzai'
+require 'html/pipeline/filter'
+require 'rouge/plugins/redcarpet'
+
+module Banzai
+  module Filter
+    # 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/banzai/filter/table_of_contents_filter.rb b/lib/banzai/filter/table_of_contents_filter.rb
new file mode 100644
index 00000000000..92d130074dc
--- /dev/null
+++ b/lib/banzai/filter/table_of_contents_filter.rb
@@ -0,0 +1,63 @@
+require 'banzai'
+require 'html/pipeline/filter'
+
+module Banzai
+  module Filter
+    # 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/banzai/filter/task_list_filter.rb b/lib/banzai/filter/task_list_filter.rb
new file mode 100644
index 00000000000..bdf7c2ebdfc
--- /dev/null
+++ b/lib/banzai/filter/task_list_filter.rb
@@ -0,0 +1,24 @@
+require 'banzai'
+require 'task_list/filter'
+
+module Banzai
+  module Filter
+    # 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/banzai/filter/upload_link_filter.rb b/lib/banzai/filter/upload_link_filter.rb
new file mode 100644
index 00000000000..1a1d0aad8ca
--- /dev/null
+++ b/lib/banzai/filter/upload_link_filter.rb
@@ -0,0 +1,47 @@
+require 'banzai'
+require 'html/pipeline/filter'
+require 'uri'
+
+module Banzai
+  module Filter
+    # 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/banzai/filter/user_reference_filter.rb b/lib/banzai/filter/user_reference_filter.rb
new file mode 100644
index 00000000000..67c24faf991
--- /dev/null
+++ b/lib/banzai/filter/user_reference_filter.rb
@@ -0,0 +1,129 @@
+require 'banzai'
+
+module Banzai
+  module Filter
+    # 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
+
+        replace_link_nodes_with_href(User.reference_pattern) do |link, text|
+          user_link_filter(link, link_text: text)
+        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, link_text: nil)
+        self.class.references_in(text) do |match, username|
+          if username == 'all'
+            link_to_all(link_text: link_text)
+          elsif namespace = Namespace.find_by(path: username)
+            link_to_namespace(namespace, link_text: link_text) || 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(link_text: nil)
+        project = context[:project]
+        url = urls.namespace_project_url(project.namespace, project,
+                                         only_path: context[:only_path])
+        data = data_attribute(project: project.id)
+        text = link_text || User.reference_prefix + 'all'
+
+        link_tag(url, data, text)
+      end
+
+      def link_to_namespace(namespace, link_text: nil)
+        if namespace.is_a?(Group)
+          link_to_group(namespace.path, namespace, link_text: link_text)
+        else
+          link_to_user(namespace.path, namespace, link_text: link_text)
+        end
+      end
+
+      def link_to_group(group, namespace, link_text: nil)
+        url = urls.group_url(group, only_path: context[:only_path])
+        data = data_attribute(group: namespace.id)
+        text = link_text || Group.reference_prefix + group
+
+        link_tag(url, data, text)
+      end
+
+      def link_to_user(user, namespace, link_text: nil)
+        url = urls.user_url(user, only_path: context[:only_path])
+        data = data_attribute(user: namespace.owner_id)
+        text = link_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/banzai/lazy_reference.rb b/lib/banzai/lazy_reference.rb
new file mode 100644
index 00000000000..073ec5d9801
--- /dev/null
+++ b/lib/banzai/lazy_reference.rb
@@ -0,0 +1,27 @@
+require 'banzai'
+
+module Banzai
+  class LazyReference
+    def self.load(refs)
+      lazy_references, values = refs.partition { |ref| ref.is_a?(self) }
+
+      lazy_values = lazy_references.group_by(&:klass).flat_map do |klass, refs|
+        ids = refs.flat_map(&:ids)
+        klass.where(id: ids)
+      end
+
+      values + lazy_values
+    end
+
+    attr_reader :klass, :ids
+
+    def initialize(klass, ids)
+      @klass = klass
+      @ids = Array.wrap(ids).map(&:to_i)
+    end
+
+    def load
+      self.klass.where(id: self.ids)
+    end
+  end
+end
diff --git a/lib/banzai/pipeline.rb b/lib/banzai/pipeline.rb
new file mode 100644
index 00000000000..4e017809d9d
--- /dev/null
+++ b/lib/banzai/pipeline.rb
@@ -0,0 +1,10 @@
+require 'banzai'
+
+module Banzai
+  module Pipeline
+    def self.[](name)
+      name ||= :full
+      const_get("#{name.to_s.camelize}Pipeline")
+    end
+  end
+end
diff --git a/lib/banzai/pipeline/asciidoc_pipeline.rb b/lib/banzai/pipeline/asciidoc_pipeline.rb
new file mode 100644
index 00000000000..5e76a817be5
--- /dev/null
+++ b/lib/banzai/pipeline/asciidoc_pipeline.rb
@@ -0,0 +1,13 @@
+require 'banzai'
+
+module Banzai
+  module Pipeline
+    class AsciidocPipeline < BasePipeline
+      def self.filters
+        [
+          Filter::RelativeLinkFilter
+        ]
+      end
+    end
+  end
+end
diff --git a/lib/banzai/pipeline/atom_pipeline.rb b/lib/banzai/pipeline/atom_pipeline.rb
new file mode 100644
index 00000000000..957f352aec5
--- /dev/null
+++ b/lib/banzai/pipeline/atom_pipeline.rb
@@ -0,0 +1,14 @@
+require 'banzai'
+
+module Banzai
+  module Pipeline
+    class AtomPipeline < FullPipeline
+      def self.transform_context(context)
+        super(context).merge(
+          only_path: false,
+          xhtml: true
+        )
+      end
+    end
+  end
+end
diff --git a/lib/banzai/pipeline/base_pipeline.rb b/lib/banzai/pipeline/base_pipeline.rb
new file mode 100644
index 00000000000..cd30009e5c0
--- /dev/null
+++ b/lib/banzai/pipeline/base_pipeline.rb
@@ -0,0 +1,30 @@
+require 'banzai'
+require 'html/pipeline'
+
+module Banzai
+  module Pipeline
+    class BasePipeline
+      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/banzai/pipeline/combined_pipeline.rb b/lib/banzai/pipeline/combined_pipeline.rb
new file mode 100644
index 00000000000..f3bf1809d18
--- /dev/null
+++ b/lib/banzai/pipeline/combined_pipeline.rb
@@ -0,0 +1,27 @@
+require 'banzai'
+
+module Banzai
+  module Pipeline
+    module CombinedPipeline
+      def self.new(*pipelines)
+        Class.new(BasePipeline) 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) do |context, pipeline|
+              pipeline.transform_context(context)
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/banzai/pipeline/description_pipeline.rb b/lib/banzai/pipeline/description_pipeline.rb
new file mode 100644
index 00000000000..94c2cb165a5
--- /dev/null
+++ b/lib/banzai/pipeline/description_pipeline.rb
@@ -0,0 +1,14 @@
+require 'banzai'
+
+module Banzai
+  module Pipeline
+    class DescriptionPipeline < FullPipeline
+      def self.transform_context(context)
+        super(context).merge(
+          # SanitizationFilter
+          inline_sanitization: true
+        )
+      end
+    end
+  end
+end
diff --git a/lib/banzai/pipeline/email_pipeline.rb b/lib/banzai/pipeline/email_pipeline.rb
new file mode 100644
index 00000000000..14356145a35
--- /dev/null
+++ b/lib/banzai/pipeline/email_pipeline.rb
@@ -0,0 +1,13 @@
+require 'banzai'
+
+module Banzai
+  module Pipeline
+    class EmailPipeline < FullPipeline
+      def self.transform_context(context)
+        super(context).merge(
+          only_path: false
+        )
+      end
+    end
+  end
+end
diff --git a/lib/banzai/pipeline/full_pipeline.rb b/lib/banzai/pipeline/full_pipeline.rb
new file mode 100644
index 00000000000..72395a5d50e
--- /dev/null
+++ b/lib/banzai/pipeline/full_pipeline.rb
@@ -0,0 +1,9 @@
+require 'banzai'
+
+module Banzai
+  module Pipeline
+    class FullPipeline < CombinedPipeline.new(PlainMarkdownPipeline, GfmPipeline)
+
+    end
+  end
+end
diff --git a/lib/banzai/pipeline/gfm_pipeline.rb b/lib/banzai/pipeline/gfm_pipeline.rb
new file mode 100644
index 00000000000..38750b55ec7
--- /dev/null
+++ b/lib/banzai/pipeline/gfm_pipeline.rb
@@ -0,0 +1,41 @@
+require 'banzai'
+
+module Banzai
+  module Pipeline
+    class GfmPipeline < BasePipeline
+      def self.filters
+        @filters ||= [
+          Filter::SyntaxHighlightFilter,
+          Filter::SanitizationFilter,
+
+          Filter::UploadLinkFilter,
+          Filter::EmojiFilter,
+          Filter::TableOfContentsFilter,
+          Filter::AutolinkFilter,
+          Filter::ExternalLinkFilter,
+
+          Filter::UserReferenceFilter,
+          Filter::IssueReferenceFilter,
+          Filter::ExternalIssueReferenceFilter,
+          Filter::MergeRequestReferenceFilter,
+          Filter::SnippetReferenceFilter,
+          Filter::CommitRangeReferenceFilter,
+          Filter::CommitReferenceFilter,
+          Filter::LabelReferenceFilter,
+
+          Filter::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/banzai/pipeline/note_pipeline.rb b/lib/banzai/pipeline/note_pipeline.rb
new file mode 100644
index 00000000000..89335143852
--- /dev/null
+++ b/lib/banzai/pipeline/note_pipeline.rb
@@ -0,0 +1,14 @@
+require 'banzai'
+
+module Banzai
+  module Pipeline
+    class NotePipeline < FullPipeline
+      def self.transform_context(context)
+        super(context).merge(
+          # TableOfContentsFilter
+          no_header_anchors: true
+        )
+      end
+    end
+  end
+end
diff --git a/lib/banzai/pipeline/plain_markdown_pipeline.rb b/lib/banzai/pipeline/plain_markdown_pipeline.rb
new file mode 100644
index 00000000000..998fd75daa2
--- /dev/null
+++ b/lib/banzai/pipeline/plain_markdown_pipeline.rb
@@ -0,0 +1,13 @@
+require 'banzai'
+
+module Banzai
+  module Pipeline
+    class PlainMarkdownPipeline < BasePipeline
+      def self.filters
+        [
+          Filter::MarkdownFilter
+        ]
+      end
+    end
+  end
+end
diff --git a/lib/banzai/pipeline/post_process_pipeline.rb b/lib/banzai/pipeline/post_process_pipeline.rb
new file mode 100644
index 00000000000..148f24b6ce1
--- /dev/null
+++ b/lib/banzai/pipeline/post_process_pipeline.rb
@@ -0,0 +1,20 @@
+require 'banzai'
+
+module Banzai
+  module Pipeline
+    class PostProcessPipeline < BasePipeline
+      def self.filters
+        [
+          Filter::RelativeLinkFilter,
+          Filter::RedactorFilter
+        ]
+      end
+
+      def self.transform_context(context)
+        context.merge(
+          post_process: true
+        )
+      end
+    end
+  end
+end
diff --git a/lib/banzai/pipeline/reference_extraction_pipeline.rb b/lib/banzai/pipeline/reference_extraction_pipeline.rb
new file mode 100644
index 00000000000..4f9bc9fcccc
--- /dev/null
+++ b/lib/banzai/pipeline/reference_extraction_pipeline.rb
@@ -0,0 +1,13 @@
+require 'banzai'
+
+module Banzai
+  module Pipeline
+    class ReferenceExtractionPipeline < BasePipeline
+      def self.filters
+        [
+          Filter::ReferenceGathererFilter
+        ]
+      end
+    end
+  end
+end
diff --git a/lib/banzai/pipeline/single_line_pipeline.rb b/lib/banzai/pipeline/single_line_pipeline.rb
new file mode 100644
index 00000000000..6725c9039a9
--- /dev/null
+++ b/lib/banzai/pipeline/single_line_pipeline.rb
@@ -0,0 +1,9 @@
+require 'banzai'
+
+module Banzai
+  module Pipeline
+    class SingleLinePipeline < GfmPipeline
+
+    end
+  end
+end
diff --git a/lib/banzai/reference_extractor.rb b/lib/banzai/reference_extractor.rb
new file mode 100644
index 00000000000..8ae5b890953
--- /dev/null
+++ b/lib/banzai/reference_extractor.rb
@@ -0,0 +1,55 @@
+require 'banzai'
+
+module Banzai
+  # Extract possible GFM references from an arbitrary String for further processing.
+  class ReferenceExtractor
+    class << self
+      LAZY_KEY = :banzai_reference_extractor_lazy
+
+      def lazy?
+        Thread.current[LAZY_KEY]
+      end
+
+      def lazily(values = nil, &block)
+        return values || block.call if lazy?
+
+        begin
+          Thread.current[LAZY_KEY] = true
+
+          values ||= block.call
+
+          Banzai::LazyReference.load(values.uniq).uniq
+        ensure
+          Thread.current[LAZY_KEY] = false
+        end
+      end
+    end
+
+    def initialize
+      @texts = []
+    end
+
+    def analyze(text, context = {})
+      @texts << Renderer.render(text, context)
+    end
+
+    def references(type, context = {})
+      filter = Banzai::Filter["#{type}_reference"]
+
+      context.merge!(
+        pipeline: :reference_extraction,
+
+        # ReferenceGathererFilter
+        reference_filter: filter
+      )
+
+      self.class.lazily do
+        @texts.flat_map do |html|
+          text_context = context.dup
+          result = Renderer.render_result(html, text_context)
+          result[:references][type]
+        end.uniq
+      end
+    end
+  end
+end
diff --git a/lib/banzai/renderer.rb b/lib/banzai/renderer.rb
new file mode 100644
index 00000000000..891c0fd7749
--- /dev/null
+++ b/lib/banzai/renderer.rb
@@ -0,0 +1,76 @@
+module Banzai
+  module Renderer
+    # Convert a Markdown String into an HTML-safe String of HTML
+    #
+    # Note that while the returned HTML will have been sanitized of dangerous
+    # HTML, it may post a risk of information leakage if it's not also passed
+    # through `post_process`.
+    #
+    # Also note that the returned String is always HTML, not XHTML. Views
+    # requiring XHTML, such as Atom feeds, need to call `post_process` on the
+    # result, providing the appropriate `pipeline` option.
+    #
+    # markdown - Markdown String
+    # context  - Hash of context options passed to our HTML Pipeline
+    #
+    # 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
+        Rails.cache.fetch(cache_key) do
+          cacheless_render(text, context)
+        end
+      else
+        cacheless_render(text, context)
+      end
+    end
+
+    def self.render_result(text, context = {})
+      Pipeline[context[:pipeline]].call(text, context)
+    end
+
+    # 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
+    # context  - 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, context)
+      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
+        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_name)
+      return unless cache_key
+      ["banzai", *cache_key, pipeline_name || :full]
+    end
+  end
+end
diff --git a/lib/gitlab/asciidoc.rb b/lib/gitlab/asciidoc.rb
index 330d3342dd1..b203b9d70e4 100644
--- a/lib/gitlab/asciidoc.rb
+++ b/lib/gitlab/asciidoc.rb
@@ -32,7 +32,7 @@ module Gitlab
       html = ::Asciidoctor.convert(input, asciidoc_opts)
 
       if context[:project]
-        html = Gitlab::Markdown.render(html, context.merge(pipeline: :asciidoc))
+        html = Banzai.render(html, context.merge(pipeline: :asciidoc))
       end
 
       html.html_safe
diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb
deleted file mode 100644
index f4e2cefca51..00000000000
--- a/lib/gitlab/markdown.rb
+++ /dev/null
@@ -1,115 +0,0 @@
-require 'html/pipeline'
-
-module Gitlab
-  # Custom parser for GitLab-flavored Markdown
-  #
-  # See the files in `lib/gitlab/markdown/` for specific processing information.
-  module Markdown
-    # Convert a Markdown String into an HTML-safe String of HTML
-    #
-    # Note that while the returned HTML will have been sanitized of dangerous
-    # HTML, it may post a risk of information leakage if it's not also passed
-    # through `post_process`.
-    #
-    # Also note that the returned String is always HTML, not XHTML. Views
-    # requiring XHTML, such as Atom feeds, need to call `post_process` on the
-    # result, providing the appropriate `pipeline` option.
-    #
-    # markdown - Markdown String
-    # context  - Hash of context options passed to our HTML Pipeline
-    #
-    # 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
-        Rails.cache.fetch(cache_key) do
-          cacheless_render(text, context)
-        end
-      else
-        cacheless_render(text, context)
-      end
-    end
-
-    def self.render_result(text, context = {})
-      Pipeline[context[:pipeline]].call(text, context)
-    end
-
-    # 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
-    # context  - 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, context)
-      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
-        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_name)
-      return unless cache_key
-      ["markdown", *cache_key, pipeline_name || :full]
-    end
-
-    # Provide autoload paths for filters to prevent a circular dependency error
-    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/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/abstract_reference_filter.rb b/lib/gitlab/markdown/abstract_reference_filter.rb
deleted file mode 100644
index 9488e980c08..00000000000
--- a/lib/gitlab/markdown/abstract_reference_filter.rb
+++ /dev/null
@@ -1,145 +0,0 @@
-require 'gitlab/markdown'
-
-module Gitlab
-  module Markdown
-    # Issues, Merge Requests, Snippets, Commits and Commit Ranges share
-    # similar functionality in reference filtering.
-    class AbstractReferenceFilter < ReferenceFilter
-      include CrossProjectReference
-
-      def self.object_class
-        # Implement in child class
-        # Example: MergeRequest
-      end
-
-      def self.object_name
-        object_class.name.underscore
-      end
-
-      def self.object_sym
-        object_name.to_sym
-      end
-
-      def self.data_reference
-        "data-#{object_name.dasherize}"
-      end
-
-      # Public: Find references in text (like `!123` for merge requests)
-      #
-      #   AnyReferenceFilter.references_in(text) do |match, id, project_ref, matches|
-      #     object = find_object(project_ref, id)
-      #     "<a href=...>#{object.to_reference}</a>"
-      #   end
-      #
-      # text - String text to search.
-      #
-      # Yields the String match, the Integer referenced object ID, an optional String
-      # of the external project reference, and all of the matchdata.
-      #
-      # Returns a String replaced with the return of the block.
-      def self.references_in(text, pattern = object_class.reference_pattern)
-        text.gsub(pattern) do |match|
-          yield match, $~[object_sym].to_i, $~[:project], $~
-        end
-      end
-
-      def self.referenced_by(node)
-        { object_sym => LazyReference.new(object_class, node.attr(data_reference)) }
-      end
-
-      delegate :object_class, :object_sym, :references_in, to: :class
-
-      def find_object(project, id)
-        # Implement in child class
-        # Example: project.merge_requests.find
-      end
-
-      def url_for_object(object, project)
-        # Implement in child class
-        # Example: project_merge_request_url
-      end
-
-      def call
-        # `#123`
-        replace_text_nodes_matching(object_class.reference_pattern) do |content|
-          object_link_filter(content, object_class.reference_pattern)
-        end
-
-        # `[Issue](#123)`, which is turned into
-        # `<a href="#123">Issue</a>`
-        replace_link_nodes_with_href(object_class.reference_pattern) do |link, text|
-          object_link_filter(link, object_class.reference_pattern, link_text: text)
-        end
-
-        # `http://gitlab.example.com/namespace/project/issues/123`, which is turned into
-        # `<a href="http://gitlab.example.com/namespace/project/issues/123">http://gitlab.example.com/namespace/project/issues/123</a>`
-        replace_link_nodes_with_text(object_class.link_reference_pattern) do |text|
-          object_link_filter(text, object_class.link_reference_pattern)
-        end
-
-        # `[Issue](http://gitlab.example.com/namespace/project/issues/123)`, which is turned into
-        # `<a href="http://gitlab.example.com/namespace/project/issues/123">Issue</a>`
-        replace_link_nodes_with_href(object_class.link_reference_pattern) do |link, text|
-          object_link_filter(link, object_class.link_reference_pattern, link_text: text)
-        end
-      end
-
-      # Replace references (like `!123` for merge requests) in text with links
-      # to the referenced object's details page.
-      #
-      # text - String text to replace references in.
-      # pattern - Reference pattern to match against.
-      # link_text - Original content of the link being replaced.
-      #
-      # Returns a String with references replaced with links. All links
-      # have `gfm` and `gfm-OBJECT_NAME` class names attached for styling.
-      def object_link_filter(text, pattern, link_text: nil)
-        references_in(text, pattern) do |match, id, project_ref, matches|
-          project = project_from_ref(project_ref)
-
-          if project && object = find_object(project, id)
-            title = escape_once(object_link_title(object))
-            klass = reference_class(object_sym)
-
-            data  = data_attribute(
-              original:     link_text || match,
-              project:      project.id,
-              object_sym => object.id
-            )
-
-            url = matches[:url] if matches.names.include?("url")
-            url ||= url_for_object(object, project)
-
-            text = link_text
-            unless text
-              text = object.reference_link_text(context[:project])
-
-              extras = object_link_text_extras(object, matches)
-              text += " (#{extras.join(", ")})" if extras.any?
-            end
-
-            %(<a href="#{url}" #{data}
-                 title="#{title}"
-                 class="#{klass}">#{text}</a>)
-          else
-            match
-          end
-        end
-      end
-
-      def object_link_text_extras(object, matches)
-        extras = []
-
-        if matches.names.include?("anchor") && matches[:anchor] && matches[:anchor] =~ /\A\#note_(\d+)\z/
-          extras << "comment #{$1}"
-        end
-
-        extras
-      end
-
-      def object_link_title(object)
-        "#{object_class.name.titleize}: #{object.title}"
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/markdown/combined_pipeline.rb b/lib/gitlab/markdown/combined_pipeline.rb
deleted file mode 100644
index 6b08a5e9f72..00000000000
--- a/lib/gitlab/markdown/combined_pipeline.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-require 'gitlab/markdown'
-
-module Gitlab
-  module Markdown
-    module CombinedPipeline
-      def self.new(*pipelines)
-        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) do |context, pipeline|
-              pipeline.transform_context(context)
-            end
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/markdown/cross_project_reference.rb b/lib/gitlab/markdown/cross_project_reference.rb
deleted file mode 100644
index 6ab04a584b0..00000000000
--- a/lib/gitlab/markdown/cross_project_reference.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require 'gitlab/markdown'
-
-module Gitlab
-  module Markdown
-    # Common methods for ReferenceFilters that support an optional cross-project
-    # reference.
-    module CrossProjectReference
-      # Given a cross-project reference string, get the Project record
-      #
-      # Defaults to value of `context[:project]` if:
-      # * No reference is given OR
-      # * Reference given doesn't exist
-      #
-      # ref - String reference.
-      #
-      # Returns a Project, or nil if the reference can't be found
-      def project_from_ref(ref)
-        return context[:project] unless ref
-
-        Project.find_with_namespace(ref)
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/markdown/filter/autolink_filter.rb b/lib/gitlab/markdown/filter/autolink_filter.rb
deleted file mode 100644
index c37c3bc55bf..00000000000
--- a/lib/gitlab/markdown/filter/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/filter/commit_range_reference_filter.rb b/lib/gitlab/markdown/filter/commit_range_reference_filter.rb
deleted file mode 100644
index 36b3258ef76..00000000000
--- a/lib/gitlab/markdown/filter/commit_range_reference_filter.rb
+++ /dev/null
@@ -1,58 +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 < AbstractReferenceFilter
-      def self.object_class
-        CommitRange
-      end
-
-      def self.references_in(text, pattern = CommitRange.reference_pattern)
-        text.gsub(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 = find_object(project, id)
-
-        return unless range
-
-        { commit_range: range }
-      end
-
-      def initialize(*args)
-        super
-
-        @commit_map = {}
-      end
-
-      def self.find_object(project, id)
-        range = CommitRange.new(id, project)
-
-        range.valid_commits? ? range : nil
-      end
-
-      def find_object(*args)
-        self.class.find_object(*args)
-      end
-
-      def url_for_object(range, project)
-        h = Gitlab::Application.routes.url_helpers
-        h.namespace_project_compare_url(project.namespace, project,
-                                        range.to_param.merge(only_path: context[:only_path]))
-      end
-
-      def object_link_title(range)
-        range.reference_title
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/markdown/filter/commit_reference_filter.rb b/lib/gitlab/markdown/filter/commit_reference_filter.rb
deleted file mode 100644
index e3066a89b04..00000000000
--- a/lib/gitlab/markdown/filter/commit_reference_filter.rb
+++ /dev/null
@@ -1,63 +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 < AbstractReferenceFilter
-      def self.object_class
-        Commit
-      end
-
-      def self.references_in(text, pattern = Commit.reference_pattern)
-        text.gsub(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 = find_object(project, id)
-
-        return unless commit
-
-        { commit: commit }
-      end
-
-      def self.find_object(project, id)
-        if project && project.valid_repo?
-          project.commit(id)
-        end
-      end
-
-      def find_object(*args)
-        self.class.find_object(*args)
-      end
-
-      def url_for_object(commit, project)
-        h = Gitlab::Application.routes.url_helpers
-        h.namespace_project_commit_url(project.namespace, project, commit,
-                                        only_path: context[:only_path])
-      end
-
-      def object_link_title(commit)
-        commit.link_title
-      end
-
-      def object_link_text_extras(object, matches)
-        extras = super
-
-        path = matches[:path] if matches.names.include?("path")
-        if path == '/builds'
-          extras.unshift "builds"
-        end
-
-        extras
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/markdown/filter/emoji_filter.rb b/lib/gitlab/markdown/filter/emoji_filter.rb
deleted file mode 100644
index da10e4d3760..00000000000
--- a/lib/gitlab/markdown/filter/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/filter/external_issue_reference_filter.rb b/lib/gitlab/markdown/filter/external_issue_reference_filter.rb
deleted file mode 100644
index 14bdf5521fc..00000000000
--- a/lib/gitlab/markdown/filter/external_issue_reference_filter.rb
+++ /dev/null
@@ -1,69 +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
-
-        replace_link_nodes_with_href(ExternalIssue.reference_pattern) do |link, text|
-          issue_link_filter(link, link_text: text)
-        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, link_text: nil)
-        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)
-
-          text = link_text || match
-
-          %(<a href="#{url}" #{data}
-               title="#{title}"
-               class="#{klass}">#{text}</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
deleted file mode 100644
index e09dfcb83c8..00000000000
--- a/lib/gitlab/markdown/filter/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|
-          link = node.attr('href')
-
-          next unless link
-
-          # 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
deleted file mode 100644
index 1ed69e2f431..00000000000
--- a/lib/gitlab/markdown/filter/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/filter/label_reference_filter.rb b/lib/gitlab/markdown/filter/label_reference_filter.rb
deleted file mode 100644
index a2026eecaeb..00000000000
--- a/lib/gitlab/markdown/filter/label_reference_filter.rb
+++ /dev/null
@@ -1,96 +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
-
-        replace_link_nodes_with_href(Label.reference_pattern) do |link, text|
-          label_link_filter(link, link_text: text)
-        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, link_text: nil)
-        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(
-              original: link_text || match,
-              project: project.id,
-              label: label.id
-            )
-
-            text = link_text || render_colored_label(label)
-
-            %(<a href="#{url}" #{data}
-                 class="#{klass}">#{text}</a>)
-          else
-            match
-          end
-        end
-      end
-
-      def url_for_label(project, label)
-        h = Gitlab::Application.routes.url_helpers
-        h.namespace_project_issues_url( 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
deleted file mode 100644
index 921e2a0794e..00000000000
--- a/lib/gitlab/markdown/filter/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/filter/merge_request_reference_filter.rb b/lib/gitlab/markdown/filter/merge_request_reference_filter.rb
deleted file mode 100644
index 2eb77c46da7..00000000000
--- a/lib/gitlab/markdown/filter/merge_request_reference_filter.rb
+++ /dev/null
@@ -1,41 +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
-
-      def object_link_text_extras(object, matches)
-        extras = super
-
-        path = matches[:path] if matches.names.include?("path")
-        case path
-        when '/diffs'
-          extras.unshift "diffs"
-        when '/commits'
-          extras.unshift "commits"
-        when '/builds'
-          extras.unshift "builds"
-        end
-
-        extras
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/markdown/filter/redactor_filter.rb b/lib/gitlab/markdown/filter/redactor_filter.rb
deleted file mode 100644
index 33ef7ce18b5..00000000000
--- a/lib/gitlab/markdown/filter/redactor_filter.rb
+++ /dev/null
@@ -1,43 +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)
-            # The reference should be replaced by the original text,
-            # which is not always the same as the rendered text.
-            text = node.attr('data-original') || node.text
-            node.replace(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 = Gitlab::Markdown.const_get(reference_type)
-
-          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
deleted file mode 100644
index 62f241b4967..00000000000
--- a/lib/gitlab/markdown/filter/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 = Gitlab::Markdown.const_get(reference_type)
-
-        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
deleted file mode 100644
index 81f60120fcd..00000000000
--- a/lib/gitlab/markdown/filter/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/filter/sanitization_filter.rb b/lib/gitlab/markdown/filter/sanitization_filter.rb
deleted file mode 100644
index cf153f30622..00000000000
--- a/lib/gitlab/markdown/filter/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/filter/snippet_reference_filter.rb b/lib/gitlab/markdown/filter/snippet_reference_filter.rb
deleted file mode 100644
index f7bd07c2a34..00000000000
--- a/lib/gitlab/markdown/filter/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/filter/syntax_highlight_filter.rb b/lib/gitlab/markdown/filter/syntax_highlight_filter.rb
deleted file mode 100644
index 8597e02f0de..00000000000
--- a/lib/gitlab/markdown/filter/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/filter/table_of_contents_filter.rb b/lib/gitlab/markdown/filter/table_of_contents_filter.rb
deleted file mode 100644
index bbb3bf7fc8b..00000000000
--- a/lib/gitlab/markdown/filter/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/filter/task_list_filter.rb b/lib/gitlab/markdown/filter/task_list_filter.rb
deleted file mode 100644
index 2f133ae8500..00000000000
--- a/lib/gitlab/markdown/filter/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/filter/upload_link_filter.rb b/lib/gitlab/markdown/filter/upload_link_filter.rb
deleted file mode 100644
index fbada73ab86..00000000000
--- a/lib/gitlab/markdown/filter/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/filter/user_reference_filter.rb b/lib/gitlab/markdown/filter/user_reference_filter.rb
deleted file mode 100644
index 0a20d9c0347..00000000000
--- a/lib/gitlab/markdown/filter/user_reference_filter.rb
+++ /dev/null
@@ -1,129 +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
-
-        replace_link_nodes_with_href(User.reference_pattern) do |link, text|
-          user_link_filter(link, link_text: text)
-        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, link_text: nil)
-        self.class.references_in(text) do |match, username|
-          if username == 'all'
-            link_to_all(link_text: link_text)
-          elsif namespace = Namespace.find_by(path: username)
-            link_to_namespace(namespace, link_text: link_text) || 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(link_text: nil)
-        project = context[:project]
-        url = urls.namespace_project_url(project.namespace, project,
-                                         only_path: context[:only_path])
-        data = data_attribute(project: project.id)
-        text = link_text || User.reference_prefix + 'all'
-
-        link_tag(url, data, text)
-      end
-
-      def link_to_namespace(namespace, link_text: nil)
-        if namespace.is_a?(Group)
-          link_to_group(namespace.path, namespace, link_text: link_text)
-        else
-          link_to_user(namespace.path, namespace, link_text: link_text)
-        end
-      end
-
-      def link_to_group(group, namespace, link_text: nil)
-        url = urls.group_url(group, only_path: context[:only_path])
-        data = data_attribute(group: namespace.id)
-        text = link_text || Group.reference_prefix + group
-
-        link_tag(url, data, text)
-      end
-
-      def link_to_user(user, namespace, link_text: nil)
-        url = urls.user_url(user, only_path: context[:only_path])
-        data = data_attribute(user: namespace.owner_id)
-        text = link_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/pipeline.rb b/lib/gitlab/markdown/pipeline.rb
index d683756f95a..8f3f43c0e91 100644
--- a/lib/gitlab/markdown/pipeline.rb
+++ b/lib/gitlab/markdown/pipeline.rb
@@ -1,11 +1,11 @@
-require 'gitlab/markdown'
+require 'banzai'
 
 module Gitlab
   module Markdown
     class Pipeline
       def self.[](name)
         name ||= :full
-        Markdown.const_get("#{name.to_s.camelize}Pipeline")
+        const_get("#{name.to_s.camelize}Pipeline")
       end
 
       def self.filters
diff --git a/lib/gitlab/markdown/pipeline/asciidoc_pipeline.rb b/lib/gitlab/markdown/pipeline/asciidoc_pipeline.rb
deleted file mode 100644
index 6829b4acb95..00000000000
--- a/lib/gitlab/markdown/pipeline/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/pipeline/atom_pipeline.rb b/lib/gitlab/markdown/pipeline/atom_pipeline.rb
deleted file mode 100644
index e151f8f5e5a..00000000000
--- a/lib/gitlab/markdown/pipeline/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/pipeline/description_pipeline.rb b/lib/gitlab/markdown/pipeline/description_pipeline.rb
deleted file mode 100644
index 76f6948af8f..00000000000
--- a/lib/gitlab/markdown/pipeline/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/pipeline/email_pipeline.rb b/lib/gitlab/markdown/pipeline/email_pipeline.rb
deleted file mode 100644
index b88cb790270..00000000000
--- a/lib/gitlab/markdown/pipeline/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/pipeline/full_pipeline.rb b/lib/gitlab/markdown/pipeline/full_pipeline.rb
deleted file mode 100644
index b3b7a3c27c0..00000000000
--- a/lib/gitlab/markdown/pipeline/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/pipeline/gfm_pipeline.rb b/lib/gitlab/markdown/pipeline/gfm_pipeline.rb
deleted file mode 100644
index ca90bd75d77..00000000000
--- a/lib/gitlab/markdown/pipeline/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/pipeline/note_pipeline.rb b/lib/gitlab/markdown/pipeline/note_pipeline.rb
deleted file mode 100644
index a8bf5f42d8e..00000000000
--- a/lib/gitlab/markdown/pipeline/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/plain_markdown_pipeline.rb b/lib/gitlab/markdown/pipeline/plain_markdown_pipeline.rb
deleted file mode 100644
index 0abb93f8a03..00000000000
--- a/lib/gitlab/markdown/pipeline/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/pipeline/post_process_pipeline.rb b/lib/gitlab/markdown/pipeline/post_process_pipeline.rb
deleted file mode 100644
index 60cc32f490e..00000000000
--- a/lib/gitlab/markdown/pipeline/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/pipeline/reference_extraction_pipeline.rb b/lib/gitlab/markdown/pipeline/reference_extraction_pipeline.rb
deleted file mode 100644
index a89ab462bac..00000000000
--- a/lib/gitlab/markdown/pipeline/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/pipeline/single_line_pipeline.rb b/lib/gitlab/markdown/pipeline/single_line_pipeline.rb
deleted file mode 100644
index 2f24927b879..00000000000
--- a/lib/gitlab/markdown/pipeline/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/reference_filter.rb b/lib/gitlab/markdown/reference_filter.rb
deleted file mode 100644
index 3b83b8bd8f8..00000000000
--- a/lib/gitlab/markdown/reference_filter.rb
+++ /dev/null
@@ -1,211 +0,0 @@
-require 'active_support/core_ext/string/output_safety'
-require 'gitlab/markdown'
-require 'html/pipeline/filter'
-
-module Gitlab
-  module Markdown
-    # Base class for GitLab Flavored Markdown reference filters.
-    #
-    # References within <pre>, <code>, <a>, and <style> elements are ignored.
-    #
-    # Context options:
-    #   :project (required) - Current project, ignored if reference is cross-project.
-    #   :only_path          - Generate path-only links.
-    class ReferenceFilter < HTML::Pipeline::Filter
-      LazyReference = Struct.new(:klass, :ids) do
-        def self.load(refs)
-          lazy_references, values = refs.partition { |ref| ref.is_a?(self) }
-
-          lazy_values = lazy_references.group_by(&:klass).flat_map do |klass, refs|
-            ids = refs.flat_map(&:ids)
-            klass.where(id: ids)
-          end
-
-          values + lazy_values
-        end
-
-        def load
-          self.klass.where(id: self.ids)
-        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
-          return true if project_id == context[:project].try(:id)
-
-          project = Project.find(project_id) rescue nil
-          Ability.abilities.allowed?(user, :read_project, project)
-        else
-          true
-        end
-      end
-
-      def self.referenced_by(node)
-        raise NotImplementedError, "#{self} does not implement #{__method__}"
-      end
-
-      # Returns a data attribute String to attach to a reference link
-      #
-      # attributes - Hash, where the key becomes the data attribute name and the
-      #              value is the data attribute value
-      #
-      # Examples:
-      #
-      #   data_attribute(project: 1, issue: 2)
-      #   # => "data-reference-filter=\"SomeReferenceFilter\" data-project=\"1\" data-issue=\"2\""
-      #
-      #   data_attribute(project: 3, 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.demodulize
-        attributes.map { |key, value| %Q(data-#{key.to_s.dasherize}="#{value}") }.join(" ")
-      end
-
-      def escape_once(html)
-        ERB::Util.html_escape_once(html)
-      end
-
-      def ignore_parents
-        @ignore_parents ||= begin
-          # Don't look for references in text nodes that are children of these
-          # elements.
-          parents = %w(pre code a style)
-          parents << 'blockquote' if context[:ignore_blockquotes]
-          parents.to_set
-        end
-      end
-
-      def ignored_ancestry?(node)
-        has_ancestor?(node, ignore_parents)
-      end
-
-      def project
-        context[:project]
-      end
-
-      def reference_class(type)
-        "gfm gfm-#{type}"
-      end
-
-      # Iterate through the document's text nodes, yielding the current node's
-      # content if:
-      #
-      # * The `project` context value is present AND
-      # * The node's content matches `pattern` AND
-      # * The node is not an ancestor of an ignored node type
-      #
-      # pattern - Regex pattern against which to match the node's content
-      #
-      # Yields the current node's String contents. The result of the block will
-      # replace the node's existing content and update the current document.
-      #
-      # Returns the updated Nokogiri::HTML::DocumentFragment object.
-      def replace_text_nodes_matching(pattern)
-        return doc if project.nil?
-
-        search_text_nodes(doc).each do |node|
-          next if ignored_ancestry?(node)
-          next unless node.text =~ pattern
-
-          content = node.to_html
-
-          html = yield content
-
-          next if html == content
-
-          node.replace(html)
-        end
-
-        doc
-      end
-
-      # Iterate through the document's link nodes, yielding the current node's
-      # content if:
-      #
-      # * The `project` context value is present AND
-      # * The node's content matches `pattern`
-      #
-      # pattern - Regex pattern against which to match the node's content
-      #
-      # Yields the current node's String contents. The result of the block will
-      # replace the node and update the current document.
-      #
-      # Returns the updated Nokogiri::HTML::DocumentFragment object.
-      def replace_link_nodes_with_text(pattern)
-        return doc if project.nil?
-
-        doc.search('a').each do |node|
-          klass = node.attr('class')
-          next if klass && klass.include?('gfm')
-
-          link = node.attr('href')
-          text = node.text
-
-          next unless link && text
-
-          link = URI.decode(link)
-          # Ignore ending punctionation like periods or commas
-          next unless link == text && text =~ /\A#{pattern}/
-
-          html = yield text
-
-          next if html == text
-
-          node.replace(html)
-        end
-
-        doc
-      end
-
-      # Iterate through the document's link nodes, yielding the current node's
-      # content if:
-      #
-      # * The `project` context value is present AND
-      # * The node's HREF matches `pattern`
-      #
-      # pattern - Regex pattern against which to match the node's HREF
-      #
-      # Yields the current node's String HREF and String content.
-      # The result of the block will replace the node and update the current document.
-      #
-      # Returns the updated Nokogiri::HTML::DocumentFragment object.
-      def replace_link_nodes_with_href(pattern)
-        return doc if project.nil?
-
-        doc.search('a').each do |node|
-          klass = node.attr('class')
-          next if klass && klass.include?('gfm')
-
-          link = node.attr('href')
-          text = node.text
-
-          next unless link && text
-          link = URI.decode(link)
-          next unless link && link =~ /\A#{pattern}\z/
-
-          html = yield link, text
-
-          next if html == link
-
-          node.replace(html)
-        end
-
-        doc
-      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/reference_extractor.rb b/lib/gitlab/reference_extractor.rb
index e83167fa7d7..42f7c26f3c4 100644
--- a/lib/gitlab/reference_extractor.rb
+++ b/lib/gitlab/reference_extractor.rb
@@ -1,62 +1,27 @@
-require 'gitlab/markdown'
+require 'banzai'
 
 module Gitlab
   # Extract possible GFM references from an arbitrary String for further processing.
-  class ReferenceExtractor
-    attr_accessor :project, :current_user, :load_lazy_references
+  class ReferenceExtractor < Banzai::ReferenceExtractor
+    attr_accessor :project, :current_user
 
-    def initialize(project, current_user = nil, load_lazy_references: true)
+    def initialize(project, current_user = nil)
       @project = project
       @current_user = current_user
-      @load_lazy_references = load_lazy_references
 
-      @texts = []
       @references = {}
+
+      super()
     end
 
-    def analyze(text, options = {})
-      @texts << Gitlab::Markdown.render(text, options.merge(project: project))
+    def analyze(text, context = {})
+      super(text, context.merge(project: project))
     end
 
     %i(user label issue merge_request snippet commit commit_range).each do |type|
       define_method("#{type}s") do
-        @references[type] ||= pipeline_result(type)
+        @references[type] ||= references(type, project: project, current_user: current_user)
       end
     end
-
-    private
-
-    # Instantiate and call HTML::Pipeline with a single reference filter type,
-    # returning the result
-    #
-    # filter_type - Symbol reference type (e.g., :commit, :issue, etc.)
-    #
-    # Returns the results Array for the requested filter type
-    def pipeline_result(filter_type)
-      filter = Gitlab::Markdown::ReferenceFilter[filter_type]
-
-      context = {
-        pipeline: :reference_extraction,
-
-        project:      project,
-        current_user: current_user,
-
-        # ReferenceGathererFilter
-        load_lazy_references: false,
-        reference_filter:     filter
-      }
-
-      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
-      end
-
-      values
-    end
   end
 end
-- 
cgit v1.2.1


From 447e598ec4ee0d2fae29303d4359ffe6a06d3ba5 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Tue, 15 Dec 2015 16:24:04 +0100
Subject: Update init script options for gitlab-workhorse

---
 lib/support/init.d/gitlab                 | 3 ++-
 lib/support/init.d/gitlab.default.example | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/support/init.d/gitlab b/lib/support/init.d/gitlab
index 43fda6fa92e..aa2da92c138 100755
--- a/lib/support/init.d/gitlab
+++ b/lib/support/init.d/gitlab
@@ -33,12 +33,13 @@ app_user="git"
 app_root="/home/$app_user/gitlab"
 pid_path="$app_root/tmp/pids"
 socket_path="$app_root/tmp/sockets"
+rails_socket="$socket_path/gitlab.socket"
 web_server_pid_path="$pid_path/unicorn.pid"
 sidekiq_pid_path="$pid_path/sidekiq.pid"
 mail_room_enabled=false
 mail_room_pid_path="$pid_path/mail_room.pid"
 gitlab_workhorse_pid_path="$pid_path/gitlab-workhorse.pid"
-gitlab_workhorse_options="-listenUmask 0 -listenNetwork unix -listenAddr $socket_path/gitlab-workhorse.socket -authBackend http://127.0.0.1:8080"
+gitlab_workhorse_options="-listenUmask 0 -listenNetwork unix -listenAddr $socket_path/gitlab-workhorse.socket -authBackend http://127.0.0.1:8080 -authSocket $rails_socket -documentRoot $app_root/public"
 gitlab_workhorse_log="$app_root/log/gitlab-workhorse.log"
 shell_path="/bin/bash"
 
diff --git a/lib/support/init.d/gitlab.default.example b/lib/support/init.d/gitlab.default.example
index 79ae8e0ae55..7fc495db545 100755
--- a/lib/support/init.d/gitlab.default.example
+++ b/lib/support/init.d/gitlab.default.example
@@ -36,7 +36,7 @@ gitlab_workhorse_pid_path="$pid_path/gitlab-workhorse.pid"
 # '-listenNetwork tcp -listenAddr localhost:8181'.
 # The -authBackend setting tells gitlab-workhorse where it can reach
 # Unicorn.
-gitlab_workhorse_options="-listenUmask 0 -listenNetwork unix -listenAddr $socket_path/gitlab-workhorse.socket -authBackend http://127.0.0.1:8080"
+gitlab_workhorse_options="-listenUmask 0 -listenNetwork unix -listenAddr $socket_path/gitlab-workhorse.socket -authBackend http://127.0.0.1:8080 -authSocket $socket_path/gitlab.socket -documentRoot $app_root/public"
 gitlab_workhorse_log="$app_root/log/gitlab-workhorse.log"
 
 # mail_room_enabled specifies whether mail_room, which is used to process incoming email, is enabled.
-- 
cgit v1.2.1


From 6560d053ed0c2d5b0a00918e64417bd6b1de4d73 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Tue, 15 Dec 2015 16:57:11 +0100
Subject: Use lazy reference extractor to get issue's MRs

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

(limited to 'lib')

diff --git a/lib/banzai/reference_extractor.rb b/lib/banzai/reference_extractor.rb
index 8ae5b890953..2c197d31898 100644
--- a/lib/banzai/reference_extractor.rb
+++ b/lib/banzai/reference_extractor.rb
@@ -11,7 +11,7 @@ module Banzai
       end
 
       def lazily(values = nil, &block)
-        return values || block.call if lazy?
+        return (values || block.call).uniq if lazy?
 
         begin
           Thread.current[LAZY_KEY] = true
-- 
cgit v1.2.1


From 75ad9fff4e1293776e077b402b7e0bfcff3391d0 Mon Sep 17 00:00:00 2001
From: Trey Davis <trey@pogoseat.com>
Date: Mon, 14 Dec 2015 17:30:55 -0800
Subject: Show git version on admin page

---
 lib/gitlab/git.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lib')

diff --git a/lib/gitlab/git.rb b/lib/gitlab/git.rb
index 0c350d7c675..f065cc5e9e9 100644
--- a/lib/gitlab/git.rb
+++ b/lib/gitlab/git.rb
@@ -20,6 +20,10 @@ module Gitlab
       def blank_ref?(ref)
         ref == BLANK_SHA
       end
+
+      def version
+        Gitlab::VersionInfo.parse(Gitlab::Popen.popen(%W(#{Gitlab.config.git.bin_path} --version)).first)
+      end
     end
   end
 end
-- 
cgit v1.2.1


From d337d5e7137d9b3fd0f9b8890a3ba9296323acc7 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 16 Dec 2015 18:50:06 +0100
Subject: Temporarily disable Markdown caching

---
 lib/banzai/renderer.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/banzai/renderer.rb b/lib/banzai/renderer.rb
index 891c0fd7749..115ae914524 100644
--- a/lib/banzai/renderer.rb
+++ b/lib/banzai/renderer.rb
@@ -1,5 +1,7 @@
 module Banzai
   module Renderer
+    CACHE_ENABLED = false
+
     # Convert a Markdown String into an HTML-safe String of HTML
     #
     # Note that while the returned HTML will have been sanitized of dangerous
@@ -18,7 +20,7 @@ module Banzai
       cache_key = context.delete(:cache_key)
       cache_key = full_cache_key(cache_key, context[:pipeline])
 
-      if cache_key
+      if cache_key && CACHE_ENABLED
         Rails.cache.fetch(cache_key) do
           cacheless_render(text, context)
         end
-- 
cgit v1.2.1


From 40c0b4b22af3e6d5ab11464638cf723ef7427874 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20D=C3=A1vila?= <Ruben@GitLab.com>
Date: Wed, 16 Dec 2015 14:40:16 -0500
Subject: Fix Rubocop complain.

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

(limited to 'lib')

diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 075d0dde715..f8511ac5f5c 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -70,7 +70,7 @@ module API
       expose :forked_from_project, using: Entities::ForkedFromProject, if: lambda{ |project, options| project.forked? }
       expose :avatar_url
       expose :star_count, :forks_count
-      expose :open_issues_count, if: lambda { | project, options | project.issues_enabled? && project.default_issues_tracker? }
+      expose :open_issues_count, if: lambda { |project, options| project.issues_enabled? && project.default_issues_tracker? }
     end
 
     class ProjectMember < UserBasic
-- 
cgit v1.2.1


From c36821df9f571855b477b09c102b90a78b9079e9 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <mail@zjvandeweg.nl>
Date: Wed, 16 Dec 2015 21:39:27 +0100
Subject: Api support for requesting starred projects for user

Fixes #4112
---
 lib/api/projects.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'lib')

diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index bdf4b77596e..5e75cd35c56 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -39,6 +39,17 @@ module API
         present @projects, with: Entities::Project
       end
 
+      # Gets starred project for the authenticated user
+      #
+      # Example Request:
+      #   GET /projects/starred
+      get '/starred' do
+        @projects = current_user.starred_projects
+        @projects = filter_projects(@projects)
+        @projects = paginate @projects
+        present @projects, with: Entities::Project
+      end
+
       # Get all projects for admin user
       #
       # Example Request:
-- 
cgit v1.2.1


From f177aaa5fa789654dc440d6ec4ae3546544c1401 Mon Sep 17 00:00:00 2001
From: Drew Blessing <drew@gitlab.com>
Date: Thu, 17 Dec 2015 16:08:14 -0600
Subject: Backport JIRA service

---
 lib/banzai/filter/external_issue_reference_filter.rb | 20 +++++++++++++++++---
 lib/gitlab/reference_extractor.rb                    | 12 +++++++++++-
 2 files changed, 28 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/banzai/filter/external_issue_reference_filter.rb b/lib/banzai/filter/external_issue_reference_filter.rb
index f5737a7ac19..f5942740cd6 100644
--- a/lib/banzai/filter/external_issue_reference_filter.rb
+++ b/lib/banzai/filter/external_issue_reference_filter.rb
@@ -23,6 +23,18 @@ module Banzai
         end
       end
 
+      def self.referenced_by(node)
+        project = Project.find(node.attr("data-project")) rescue nil
+        return unless project
+
+        id = node.attr("data-external-issue")
+        external_issue = ExternalIssue.new(id, project)
+
+        return unless external_issue
+
+        { external_issue: external_issue }
+      end
+
       def call
         # Early return if the project isn't using an external tracker
         return doc if project.nil? || project.default_issues_tracker?
@@ -46,12 +58,14 @@ module Banzai
       def issue_link_filter(text, link_text: nil)
         project = context[:project]
 
-        self.class.references_in(text) do |match, issue|
-          url = url_for_issue(issue, project, only_path: context[:only_path])
+        self.class.references_in(text) do |match, id|
+          ExternalIssue.new(id, project)
+
+          url = url_for_issue(id, 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)
+          data  = data_attribute(project: project.id, external_issue: id)
 
           text = link_text || match
 
diff --git a/lib/gitlab/reference_extractor.rb b/lib/gitlab/reference_extractor.rb
index 42f7c26f3c4..0a70d21b1ce 100644
--- a/lib/gitlab/reference_extractor.rb
+++ b/lib/gitlab/reference_extractor.rb
@@ -18,10 +18,20 @@ module Gitlab
       super(text, context.merge(project: project))
     end
 
-    %i(user label issue merge_request snippet commit commit_range).each do |type|
+    %i(user label merge_request snippet commit commit_range).each do |type|
       define_method("#{type}s") do
         @references[type] ||= references(type, project: project, current_user: current_user)
       end
     end
+
+    def issues
+      options = { project: project, current_user: current_user }
+
+      if project && project.jira_tracker?
+        @references[:external_issue] ||= references(:external_issue, options)
+      else
+        @references[:issue] ||= references(:issue, options)
+      end
+    end
   end
 end
-- 
cgit v1.2.1


From 301a30e0ea573c83c28358b2c856396fda878089 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Sun, 13 Dec 2015 11:43:17 -0800
Subject: Add project permissions to all project API endpoints

This standardizes all the project API formats. Also needed to support Huboard.
---
 lib/api/projects.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 5e75cd35c56..a9e0960872a 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -25,7 +25,7 @@ module API
         @projects = current_user.authorized_projects
         @projects = filter_projects(@projects)
         @projects = paginate @projects
-        present @projects, with: Entities::Project
+        present @projects, with: Entities::ProjectWithAccess, user: current_user
       end
 
       # Get an owned projects list for authenticated user
@@ -36,7 +36,7 @@ module API
         @projects = current_user.owned_projects
         @projects = filter_projects(@projects)
         @projects = paginate @projects
-        present @projects, with: Entities::Project
+        present @projects, with: Entities::ProjectWithAccess, user: current_user
       end
 
       # Gets starred project for the authenticated user
@@ -59,7 +59,7 @@ module API
         @projects = Project.all
         @projects = filter_projects(@projects)
         @projects = paginate @projects
-        present @projects, with: Entities::Project
+        present @projects, with: Entities::ProjectWithAccess, user: current_user
       end
 
       # Get a single project
-- 
cgit v1.2.1


From a48dd40a926fdeddfdd76cea5db468a82096c7f4 Mon Sep 17 00:00:00 2001
From: Valery Sizov <vsv2711@gmail.com>
Date: Thu, 17 Dec 2015 14:29:55 +0200
Subject: base implementation of emoji picker [ci skip]

---
 lib/award_emoji.rb | 49 ++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 40 insertions(+), 9 deletions(-)

(limited to 'lib')

diff --git a/lib/award_emoji.rb b/lib/award_emoji.rb
index 4d99164bc33..d3f98d2d7f0 100644
--- a/lib/award_emoji.rb
+++ b/lib/award_emoji.rb
@@ -1,11 +1,4 @@
 class AwardEmoji
-  EMOJI_LIST = [
-    "+1", "-1", "100", "blush", "heart", "smile", "rage",
-    "beers", "disappointed", "ok_hand",
-    "helicopter", "shit", "airplane", "alarm_clock",
-    "ambulance", "anguished", "two_hearts", "wink"
-  ]
-
   ALIASES = {
     pout: "rage",
     satisfied: "laughing",
@@ -37,11 +30,49 @@ class AwardEmoji
     squirrel: "shipit"
   }.with_indifferent_access
 
-  def self.path_to_emoji_image(name)
-    "emoji/#{Emoji.emoji_filename(name)}.png"
+  CATEGORIES = {
+    other: "Other",
+    objects: "Objects",
+    places: "Places",
+    travel_places: "Travel",
+    emoticons: "Emoticons",
+    objects_symbols: "Symbols",
+    nature: "Nature",
+    celebration: "Celebration",
+    people: "People",
+    activity: "Activity",
+    flags: "Flags",
+    food_drink: "Food"
+  }.with_indifferent_access
+
+  def self.positions_by_name(name)
+    emoji = emojis_json.find do |emoji|
+      emoji["short_names"].include?(name)
+    end
+
+    [emoji["sheet_x"], emoji["sheet_y"]]
   end
 
   def self.normilize_emoji_name(name)
     ALIASES[name] || name
   end
+
+  def self.emoji_by_category
+    unless @emoji_by_category
+      @emoji_by_category = {}
+      emojis_added = []
+
+      Emoji.emojis.each do |emoji_name, data|
+        next if emojis_added.include?(data["name"])
+        emojis_added << data["name"]
+
+        @emoji_by_category[data["category"]] ||= []
+        @emoji_by_category[data["category"]] << data
+      end
+
+      @emoji_by_category = @emoji_by_category.sort.to_h
+    end
+
+    @emoji_by_category
+  end
 end
-- 
cgit v1.2.1


From e5eb700d5e8d561dc8a7ff3d35f5a8c867c4e19b Mon Sep 17 00:00:00 2001
From: Valery Sizov <valery@gitlab.com>
Date: Tue, 22 Dec 2015 17:15:25 +0200
Subject: emoji picker: minor fixes

---
 lib/award_emoji.rb | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'lib')

diff --git a/lib/award_emoji.rb b/lib/award_emoji.rb
index d3f98d2d7f0..3825f4650be 100644
--- a/lib/award_emoji.rb
+++ b/lib/award_emoji.rb
@@ -45,14 +45,6 @@ class AwardEmoji
     food_drink: "Food"
   }.with_indifferent_access
 
-  def self.positions_by_name(name)
-    emoji = emojis_json.find do |emoji|
-      emoji["short_names"].include?(name)
-    end
-
-    [emoji["sheet_x"], emoji["sheet_y"]]
-  end
-
   def self.normilize_emoji_name(name)
     ALIASES[name] || name
   end
-- 
cgit v1.2.1


From 3e6950481a90a83f183397f11b8f2a5d21233cfb Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Wed, 23 Dec 2015 10:48:10 +0100
Subject: Use method that creates runners registration token

`runners_registration_token` now creates a new token if it is blank.
---
 lib/ci/api/helpers.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/ci/api/helpers.rb b/lib/ci/api/helpers.rb
index 443563c2e4a..1c91204e98c 100644
--- a/lib/ci/api/helpers.rb
+++ b/lib/ci/api/helpers.rb
@@ -19,7 +19,7 @@ module Ci
       end
 
       def runner_registration_token_valid?
-        params[:token] == current_application_settings.ensure_runners_registration_token
+        params[:token] == current_application_settings.runners_registration_token
       end
 
       def update_runner_last_contact
-- 
cgit v1.2.1


From 9c893af7ad69b178f10e4e62f0f79a84a9918ae5 Mon Sep 17 00:00:00 2001
From: cafuego <me@cafuego.net>
Date: Thu, 24 Dec 2015 04:18:39 +0000
Subject: Fix spelling of "it's" to "its" where appropriate.

---
 lib/support/init.d/gitlab                 | 10 +++++-----
 lib/support/init.d/gitlab.default.example |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/support/init.d/gitlab b/lib/support/init.d/gitlab
index aa2da92c138..c5f07c8b508 100755
--- a/lib/support/init.d/gitlab
+++ b/lib/support/init.d/gitlab
@@ -92,7 +92,7 @@ check_pids(){
 
 ## Called when we have started the two processes and are waiting for their pid files.
 wait_for_pids(){
-  # We are sleeping a bit here mostly because sidekiq is slow at writing it's pid
+  # We are sleeping a bit here mostly because sidekiq is slow at writing its pid
   i=0;
   while [ ! -f $web_server_pid_path ] || [ ! -f $sidekiq_pid_path ] || [ ! -f $gitlab_workhorse_pid_path ] || { [ "$mail_room_enabled" = true ] && [ ! -f $mail_room_pid_path ]; }; do
     sleep 0.1;
@@ -108,7 +108,7 @@ wait_for_pids(){
 }
 
 # We use the pids in so many parts of the script it makes sense to always check them.
-# Only after start() is run should the pids change. Sidekiq sets it's own pid.
+# Only after start() is run should the pids change. Sidekiq sets its own pid.
 check_pids
 
 
@@ -290,7 +290,7 @@ stop_gitlab() {
   sleep 1
   # Cleaning up unused pids
   rm "$web_server_pid_path" 2>/dev/null
-  # rm "$sidekiq_pid_path" 2>/dev/null # Sidekiq seems to be cleaning up it's own pid.
+  # rm "$sidekiq_pid_path" 2>/dev/null # Sidekiq seems to be cleaning up its own pid.
   rm -f "$gitlab_workhorse_pid_path"
   if [ "$mail_room_enabled" = true ]; then
     rm "$mail_room_pid_path" 2>/dev/null
@@ -299,7 +299,7 @@ stop_gitlab() {
   print_status
 }
 
-## Prints the status of GitLab and it's components.
+## Prints the status of GitLab and its components.
 print_status() {
   check_status
   if [ "$web_status" != "0" ] && [ "$sidekiq_status" != "0" ] && [ "$gitlab_workhorse_status" != "0" ] && { [ "$mail_room_enabled" != true ] || [ "$mail_room_status" != "0" ]; }; then
@@ -333,7 +333,7 @@ print_status() {
   fi
 }
 
-## Tells unicorn to reload it's config and Sidekiq to restart
+## Tells unicorn to reload its config and Sidekiq to restart
 reload_gitlab(){
   exit_if_not_running
   if [ "$wpid" = "0" ];then
diff --git a/lib/support/init.d/gitlab.default.example b/lib/support/init.d/gitlab.default.example
index 7fc495db545..1937ca582b0 100755
--- a/lib/support/init.d/gitlab.default.example
+++ b/lib/support/init.d/gitlab.default.example
@@ -9,11 +9,11 @@ RAILS_ENV="production"
 # The default is "git".
 app_user="git"
 
-# app_root defines the folder in which gitlab and it's components are installed.
+# app_root defines the folder in which gitlab and its components are installed.
 # The default is "/home/$app_user/gitlab"
 app_root="/home/$app_user/gitlab"
 
-# pid_path defines a folder in which the gitlab and it's components place their pids.
+# pid_path defines a folder in which the gitlab and its components place their pids.
 # This variable is also used below to define the relevant pids for the gitlab components.
 # The default is "$app_root/tmp/pids"
 pid_path="$app_root/tmp/pids"
-- 
cgit v1.2.1


From b6de0d28303a12c76847f1137e672aa60ae174ac Mon Sep 17 00:00:00 2001
From: Valery Sizov <vsv2711@gmail.com>
Date: Thu, 24 Dec 2015 11:28:51 +0200
Subject: Emoji picker: better alias handling

---
 lib/award_emoji.rb | 53 +++++++++++++++++------------------------------------
 1 file changed, 17 insertions(+), 36 deletions(-)

(limited to 'lib')

diff --git a/lib/award_emoji.rb b/lib/award_emoji.rb
index 3825f4650be..783fcfb61ad 100644
--- a/lib/award_emoji.rb
+++ b/lib/award_emoji.rb
@@ -1,35 +1,4 @@
 class AwardEmoji
-  ALIASES = {
-    pout: "rage",
-    satisfied: "laughing",
-    hankey: "shit",
-    poop: "shit",
-    collision: "boom",
-    thumbsup: "+1",
-    thumbsdown: "-1",
-    punch: "facepunch",
-    raised_hand: "hand",
-    running: "runner",
-    ng_woman: "no_good",
-    shoe: "mans_shoe",
-    tshirt: "shirt",
-    honeybee: "bee",
-    flipper: "dolphin",
-    paw_prints: "feet",
-    waxing_gibbous_moon: "moon",
-    telephone: "phone",
-    knife: "hocho",
-    envelope: "email",
-    pencil: "memo",
-    open_book: "book",
-    sailboat: "boat",
-    red_car: "car",
-    lantern: "izakaya_lantern",
-    uk: "gb",
-    heavy_exclamation_mark: "exclamation",
-    squirrel: "shipit"
-  }.with_indifferent_access
-
   CATEGORIES = {
     other: "Other",
     objects: "Objects",
@@ -46,17 +15,15 @@ class AwardEmoji
   }.with_indifferent_access
 
   def self.normilize_emoji_name(name)
-    ALIASES[name] || name
+    aliases[name] || name
   end
 
   def self.emoji_by_category
     unless @emoji_by_category
       @emoji_by_category = {}
-      emojis_added = []
 
-      Emoji.emojis.each do |emoji_name, data|
-        next if emojis_added.include?(data["name"])
-        emojis_added << data["name"]
+      emojis.each do |emoji_name, data|
+        data["name"] = emoji_name
 
         @emoji_by_category[data["category"]] ||= []
         @emoji_by_category[data["category"]] << data
@@ -67,4 +34,18 @@ class AwardEmoji
 
     @emoji_by_category
   end
+
+  def self.emojis
+    @emojis ||= begin
+      json_path = File.join(Rails.root, 'fixtures', 'emojis', 'index.json' )
+      JSON.parse(File.read(json_path))
+    end
+  end
+
+  def self.aliases
+    @aliases ||= begin
+      json_path = File.join(Rails.root, 'fixtures', 'emojis', 'aliases.json' )
+      JSON.parse(File.read(json_path))
+    end
+  end
 end
-- 
cgit v1.2.1