From e42f720b625b3d4c4d1cb6c067034674abed194e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20K=C3=B6berl?= <markus.koeberl@tugraz.at>
Date: Mon, 29 Dec 2014 17:09:36 +0100
Subject: [PATCH 01/80] add environment variable force to the documentation

---
 doc/raketasks/backup_restore.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md
index f9d2f5dc4eb..6d31388baee 100644
--- a/doc/raketasks/backup_restore.md
+++ b/doc/raketasks/backup_restore.md
@@ -155,6 +155,7 @@ Options:
 
 ```
 BACKUP=timestamp_of_backup (required if more than one backup exists)
+force=yes (do not ask if the authorized_keys file should get regenerated)
 ```
 
 Example output:

From 44535f9375ef6335551b0c9640ddad5b9d6de1c9 Mon Sep 17 00:00:00 2001
From: Chulki Lee <chulki.lee@gmail.com>
Date: Mon, 30 Mar 2015 15:53:24 -0700
Subject: [PATCH 02/80] upgrade hipchat

---
 Gemfile      | 2 +-
 Gemfile.lock | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 465e90e71a3..52e8a3f5a60 100644
--- a/Gemfile
+++ b/Gemfile
@@ -143,7 +143,7 @@ gem "redis-rails"
 gem 'tinder', '~> 1.9.2'
 
 # HipChat integration
-gem "hipchat", "~> 1.4.0"
+gem 'hipchat', '~> 1.5.0'
 
 # Flowdock integration
 gem "gitlab-flowdock-git-hook", "~> 0.4.2"
diff --git a/Gemfile.lock b/Gemfile.lock
index 747dbe1b037..29457552eb6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -271,8 +271,9 @@ GEM
     hashie (2.1.2)
     highline (1.6.21)
     hike (1.2.3)
-    hipchat (1.4.0)
+    hipchat (1.5.0)
       httparty
+      mimemagic
     hitimes (1.2.2)
     html-pipeline (1.11.0)
       activesupport (>= 2)
@@ -284,7 +285,7 @@ GEM
       mime-types
       sanitize (~> 2.1)
     http_parser.rb (0.5.3)
-    httparty (0.13.0)
+    httparty (0.13.3)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
     httpauth (0.2.1)
@@ -329,6 +330,7 @@ GEM
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
     mime-types (1.25.1)
+    mimemagic (0.3.0)
     mini_portile (0.6.1)
     minitest (5.3.5)
     mousetrap-rails (1.4.6)
@@ -714,7 +716,7 @@ DEPENDENCIES
   guard-rspec
   guard-spinach
   haml-rails
-  hipchat (~> 1.4.0)
+  hipchat (~> 1.5.0)
   html-pipeline-gitlab (~> 0.1)
   httparty
   jasmine (= 2.0.2)

From bf813a22a1843f9ce2156a5d87487956049d8ae4 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Thu, 16 Apr 2015 08:29:07 -0700
Subject: [PATCH 03/80] Remove entry that was shipped in v7.9.1

---
 CHANGELOG | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index e8f367c332b..a5d8e29109e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -22,7 +22,6 @@ v 7.10.0 (unreleased)
   - Allow HTML tags in Markdown input
   - Fix code unfold not working on Compare commits page (Stan Hu)
   - Fix generating SSH key fingerprints with OpenSSH 6.8. (Sašo Stanovnik)
-  - Include missing events and fix save functionality in admin service template settings form (Stan Hu)
   - Fix "Import projects from" button to show the correct instructions (Stan Hu)
   - Fix dots in Wiki slugs causing errors (Stan Hu)
   - Make maximum attachment size configurable via Application Settings (Stan Hu)

From 7d5fefb780a62d063c3bbf5b050910c5542d64c1 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sat, 11 Apr 2015 18:29:25 -0400
Subject: [PATCH 04/80] Fix 'merge_reuests' typo

---
 app/assets/javascripts/shortcuts_issueable.coffee | 2 +-
 app/views/help/_shortcuts.html.haml               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/shortcuts_issueable.coffee b/app/assets/javascripts/shortcuts_issueable.coffee
index b8dae71e037..f2d30eb364d 100644
--- a/app/assets/javascripts/shortcuts_issueable.coffee
+++ b/app/assets/javascripts/shortcuts_issueable.coffee
@@ -13,7 +13,7 @@ class @ShortcutsIssueable extends ShortcutsNavigation
     )
     
     if isMergeRequest
-      @enabledHelp.push('.hidden-shortcut.merge_reuests')
+      @enabledHelp.push('.hidden-shortcut.merge_requests')
     else
       @enabledHelp.push('.hidden-shortcut.issues')
 
diff --git a/app/views/help/_shortcuts.html.haml b/app/views/help/_shortcuts.html.haml
index 7b21ca30d8c..fdeab909b76 100644
--- a/app/views/help/_shortcuts.html.haml
+++ b/app/views/help/_shortcuts.html.haml
@@ -187,7 +187,7 @@
                 %td.shortcut
                   .key m
                 %td Change milestone
-            %tbody{ class: 'hidden-shortcut merge_reuests', style: 'display:none' }
+            %tbody{ class: 'hidden-shortcut merge_requests', style: 'display:none' }
               %tr
                 %th
                 %th Merge Requests

From 7679c500abb8f6dff4c49a7dec1b1643a4aedeb0 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sat, 18 Apr 2015 14:00:56 -0400
Subject: [PATCH 05/80] Update jasmine gem

---
 Gemfile      |  4 ++--
 Gemfile.lock | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3f262655117..5c86ad15e40 100644
--- a/Gemfile
+++ b/Gemfile
@@ -251,12 +251,12 @@ group :development, :test do
   # PhantomJS driver for Capybara
   gem 'poltergeist', '~> 1.5.1'
 
-  gem 'jasmine', '2.0.2'
+  gem 'jasmine', '~> 2.2.0'
 
   gem "spring", '~> 1.3.1'
   gem "spring-commands-rspec", '1.0.4'
   gem "spring-commands-spinach", '1.0.0'
-  
+
   gem "byebug"
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index bfe626521e7..ab424c3777c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -292,12 +292,12 @@ GEM
     i18n (0.7.0)
     ice_cube (0.11.1)
     ice_nine (0.10.0)
-    jasmine (2.0.2)
-      jasmine-core (~> 2.0.0)
+    jasmine (2.2.0)
+      jasmine-core (~> 2.2)
       phantomjs
       rack (>= 1.2.1)
       rake
-    jasmine-core (2.0.0)
+    jasmine-core (2.2.0)
     jquery-atwho-rails (0.3.3)
     jquery-rails (3.1.0)
       railties (>= 3.0, < 5.0)
@@ -391,7 +391,7 @@ GEM
     parser (2.2.0.2)
       ast (>= 1.1, < 3.0)
     pg (0.15.1)
-    phantomjs (1.9.2.0)
+    phantomjs (1.9.8.0)
     poltergeist (1.5.1)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
@@ -717,7 +717,7 @@ DEPENDENCIES
   hipchat (~> 1.4.0)
   html-pipeline-gitlab (~> 0.1)
   httparty
-  jasmine (= 2.0.2)
+  jasmine (~> 2.2.0)
   jquery-atwho-rails (~> 0.3.3)
   jquery-rails
   jquery-scrollto-rails

From e15af6943ad276e9d160f786b3d58a758280c942 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sat, 18 Apr 2015 14:01:14 -0400
Subject: [PATCH 06/80] Re-run rails g jasmine:install

---
 spec/javascripts/support/jasmine.yml       | 54 ++++++++++++++++++++--
 spec/javascripts/support/jasmine_helper.rb |  6 ++-
 2 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/spec/javascripts/support/jasmine.yml b/spec/javascripts/support/jasmine.yml
index 9bfa261a356..a69c59b1837 100644
--- a/spec/javascripts/support/jasmine.yml
+++ b/spec/javascripts/support/jasmine.yml
@@ -25,7 +25,7 @@ src_files:
 #   - stylesheets/*.css
 #
 stylesheets:
-  - stylesheets/**/*.css
+  - assets/application.css
 
 # helpers
 #
@@ -38,7 +38,7 @@ stylesheets:
 #   - helpers/**/*.js
 #
 helpers:
-  - helpers/**/*.js
+  - 'helpers/**/*.js'
 
 # spec_files
 #
@@ -73,4 +73,52 @@ src_dir:
 #
 # spec_dir: spec/javascripts
 #
-spec_dir: spec/javascripts
+spec_dir:
+
+# spec_helper
+#
+# Ruby file that Jasmine server will require before starting.
+# Returned relative to your root path
+# Default spec/javascripts/support/jasmine_helper.rb
+#
+# EXAMPLE:
+#
+# spec_helper: spec/javascripts/support/jasmine_helper.rb
+#
+spec_helper: spec/javascripts/support/jasmine_helper.rb
+
+# boot_dir
+#
+# Boot directory path. Your boot_files must be returned relative to this path.
+# Default: Built in boot file
+#
+# EXAMPLE:
+#
+# boot_dir: spec/javascripts/support/boot
+#
+boot_dir:
+
+# boot_files
+#
+# Return an array of filepaths relative to boot_dir to include in order to boot Jasmine
+# Default: Built in boot file
+#
+# EXAMPLE
+#
+# boot_files:
+#   - '**/*.js'
+#
+boot_files:
+
+# rack_options
+#
+# Extra options to be passed to the rack server
+# by default, Port and AccessLog are passed.
+#
+# This is an advanced options, and left empty by default
+#
+# EXAMPLE
+#
+# rack_options:
+#   server: 'thin'
+
diff --git a/spec/javascripts/support/jasmine_helper.rb b/spec/javascripts/support/jasmine_helper.rb
index b4919802afe..4d73aec5a31 100644
--- a/spec/javascripts/support/jasmine_helper.rb
+++ b/spec/javascripts/support/jasmine_helper.rb
@@ -8,4 +8,8 @@
 #   config.boot_files = lambda { ['/absolute/path/to/boot_dir/file.js'] }
 #end
 #
-
+#Example: prevent PhantomJS auto install, uses PhantomJS already on your path.
+#Jasmine.configure do |config|
+#   config.prevent_phantom_js_auto_install = true
+#end
+#

From 0fab35217c0b5f82da0705a38697b7fab2777f15 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sat, 18 Apr 2015 14:15:37 -0400
Subject: [PATCH 07/80] Add jasmine-rails gem

---
 Gemfile      | 1 +
 Gemfile.lock | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/Gemfile b/Gemfile
index 5c86ad15e40..c429777777b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -252,6 +252,7 @@ group :development, :test do
   gem 'poltergeist', '~> 1.5.1'
 
   gem 'jasmine', '~> 2.2.0'
+  gem 'jasmine-rails'
 
   gem "spring", '~> 1.3.1'
   gem "spring-commands-rspec", '1.0.4'
diff --git a/Gemfile.lock b/Gemfile.lock
index ab424c3777c..043fcbbdfcd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -298,6 +298,11 @@ GEM
       rack (>= 1.2.1)
       rake
     jasmine-core (2.2.0)
+    jasmine-rails (0.10.8)
+      jasmine-core (>= 1.3, < 3.0)
+      phantomjs (>= 1.9)
+      railties (>= 3.2.0)
+      sprockets-rails
     jquery-atwho-rails (0.3.3)
     jquery-rails (3.1.0)
       railties (>= 3.0, < 5.0)
@@ -718,6 +723,7 @@ DEPENDENCIES
   html-pipeline-gitlab (~> 0.1)
   httparty
   jasmine (~> 2.2.0)
+  jasmine-rails
   jquery-atwho-rails (~> 0.3.3)
   jquery-rails
   jquery-scrollto-rails

From d5c7b62b8ec2e80829746147e0fa65935120231d Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sat, 18 Apr 2015 14:16:19 -0400
Subject: [PATCH 08/80] rails g jasmine_rails:install

---
 config/routes.rb                     |   1 +
 spec/javascripts/support/jasmine.yml | 156 +++++++--------------------
 2 files changed, 42 insertions(+), 115 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index 4f33b11d220..d3daf9ca78a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,6 +2,7 @@ require 'sidekiq/web'
 require 'api/api'
 
 Gitlab::Application.routes.draw do
+  mount JasmineRails::Engine => '/specs' if defined?(JasmineRails)
   use_doorkeeper do
     controllers applications: 'oauth/applications',
                 authorized_applications: 'oauth/authorized_applications',
diff --git a/spec/javascripts/support/jasmine.yml b/spec/javascripts/support/jasmine.yml
index a69c59b1837..b2732921919 100644
--- a/spec/javascripts/support/jasmine.yml
+++ b/spec/javascripts/support/jasmine.yml
@@ -1,124 +1,50 @@
-# src_files
-#
-# Return an array of filepaths relative to src_dir to include before jasmine specs.
-# Default: []
-#
-# EXAMPLE:
-#
-# src_files:
-#   - lib/source1.js
-#   - lib/source2.js
-#   - dist/**/*.js
-#
+# path to parent directory of src_files
+# relative path from Rails.root
+# defaults to app/assets/javascripts
+src_dir: "app/assets/javascripts"
+
+# path to additional directory of source file that are not part of assets pipeline and need to be included
+# relative path from Rails.root
+# defaults to []
+# include_dir:
+#   - ../mobile_app/public/js
+
+# path to parent directory of css_files
+# relative path from Rails.root
+# defaults to app/assets/stylesheets
+css_dir: "app/assets/stylesheets"
+
+# list of file expressions to include as source files
+# relative path from src_dir
 src_files:
-  - assets/application.js
+ - "application.{js.coffee,js,coffee}"
 
-# stylesheets
-#
-# Return an array of stylesheet filepaths relative to src_dir to include before jasmine specs.
-# Default: []
-#
-# EXAMPLE:
-#
-# stylesheets:
-#   - css/style.css
-#   - stylesheets/*.css
-#
-stylesheets:
-  - assets/application.css
+# list of file expressions to include as css files
+# relative path from css_dir
+css_files:
 
-# helpers
+# path to parent directory of spec_files
+# relative path from Rails.root
 #
-# Return an array of filepaths relative to spec_dir to include before jasmine specs.
-# Default: ["helpers/**/*.js"]
-#
-# EXAMPLE:
-#
-# helpers:
-#   - helpers/**/*.js
+# Alternatively accept an array of directory to include external spec files
+# spec_dir:
+#   - spec/javascripts
+#   - ../engine/spec/javascripts
 #
+# defaults to spec/javascripts
+spec_dir: spec/javascripts
+
+# list of file expressions to include as helpers into spec runner
+# relative path from spec_dir
 helpers:
-  - 'helpers/**/*.js'
+  - "helpers/**/*.{js.coffee,js,coffee}"
 
-# spec_files
-#
-# Return an array of filepaths relative to spec_dir to include.
-# Default: ["**/*[sS]pec.js"]
-#
-# EXAMPLE:
-#
-# spec_files:
-#   - **/*[sS]pec.js
-#
+# list of file expressions to include as specs into spec runner
+# relative path from spec_dir
 spec_files:
-  - '**/*[sS]pec.js'
-
-# src_dir
-#
-# Source directory path. Your src_files must be returned relative to this path. Will use root if left blank.
-# Default: project root
-#
-# EXAMPLE:
-#
-# src_dir: public
-#
-src_dir:
-
-# spec_dir
-#
-# Spec directory path. Your spec_files must be returned relative to this path.
-# Default: spec/javascripts
-#
-# EXAMPLE:
-#
-# spec_dir: spec/javascripts
-#
-spec_dir:
-
-# spec_helper
-#
-# Ruby file that Jasmine server will require before starting.
-# Returned relative to your root path
-# Default spec/javascripts/support/jasmine_helper.rb
-#
-# EXAMPLE:
-#
-# spec_helper: spec/javascripts/support/jasmine_helper.rb
-#
-spec_helper: spec/javascripts/support/jasmine_helper.rb
-
-# boot_dir
-#
-# Boot directory path. Your boot_files must be returned relative to this path.
-# Default: Built in boot file
-#
-# EXAMPLE:
-#
-# boot_dir: spec/javascripts/support/boot
-#
-boot_dir:
-
-# boot_files
-#
-# Return an array of filepaths relative to boot_dir to include in order to boot Jasmine
-# Default: Built in boot file
-#
-# EXAMPLE
-#
-# boot_files:
-#   - '**/*.js'
-#
-boot_files:
-
-# rack_options
-#
-# Extra options to be passed to the rack server
-# by default, Port and AccessLog are passed.
-#
-# This is an advanced options, and left empty by default
-#
-# EXAMPLE
-#
-# rack_options:
-#   server: 'thin'
+  - "**/*[Ss]pec.{js.coffee,js,coffee}"
 
+# path to directory of temporary files
+# (spec runner and asset cache)
+# defaults to tmp/jasmine
+tmp_dir: "tmp/jasmine"

From 662bdfbeb12883944075d3e038ea58af45f3df3a Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sat, 18 Apr 2015 14:25:54 -0400
Subject: [PATCH 09/80] Make StatGraph JS explicitly require its dependencies

This allows us to test them in a bit more isolation.
---
 app/assets/javascripts/stat_graph_contributors.js.coffee      | 4 ++++
 .../javascripts/stat_graph_contributors_graph.js.coffee       | 4 ++++
 spec/javascripts/stat_graph_contributors_graph_spec.js        | 2 ++
 spec/javascripts/stat_graph_contributors_util_spec.js         | 2 ++
 spec/javascripts/stat_graph_spec.js                           | 2 ++
 5 files changed, 14 insertions(+)

diff --git a/app/assets/javascripts/stat_graph_contributors.js.coffee b/app/assets/javascripts/stat_graph_contributors.js.coffee
index 27f0fd31d50..ed12bdcef22 100644
--- a/app/assets/javascripts/stat_graph_contributors.js.coffee
+++ b/app/assets/javascripts/stat_graph_contributors.js.coffee
@@ -1,3 +1,7 @@
+#= require d3
+#= require jquery
+#= require stat_graph_contributors_util
+
 class @ContributorsStatGraph
   init: (log) ->
     @parsed_log = ContributorsStatGraphUtil.parse_log(log)
diff --git a/app/assets/javascripts/stat_graph_contributors_graph.js.coffee b/app/assets/javascripts/stat_graph_contributors_graph.js.coffee
index 8b82d20c6c2..0e6fbdef3bc 100644
--- a/app/assets/javascripts/stat_graph_contributors_graph.js.coffee
+++ b/app/assets/javascripts/stat_graph_contributors_graph.js.coffee
@@ -1,3 +1,7 @@
+#= require d3
+#= require jquery
+#= require underscore
+
 class @ContributorsGraph
   MARGIN:
     top: 20
diff --git a/spec/javascripts/stat_graph_contributors_graph_spec.js b/spec/javascripts/stat_graph_contributors_graph_spec.js
index 1090cb7f620..78d39f1b428 100644
--- a/spec/javascripts/stat_graph_contributors_graph_spec.js
+++ b/spec/javascripts/stat_graph_contributors_graph_spec.js
@@ -1,3 +1,5 @@
+//= require stat_graph_contributors_graph
+
 describe("ContributorsGraph", function () {
   describe("#set_x_domain", function () {
     it("set the x_domain", function () {
diff --git a/spec/javascripts/stat_graph_contributors_util_spec.js b/spec/javascripts/stat_graph_contributors_util_spec.js
index 9c1b588861d..ee90892eb48 100644
--- a/spec/javascripts/stat_graph_contributors_util_spec.js
+++ b/spec/javascripts/stat_graph_contributors_util_spec.js
@@ -1,3 +1,5 @@
+//= require stat_graph_contributors_util
+
 describe("ContributorsStatGraphUtil", function () {
 
   describe("#parse_log", function () {
diff --git a/spec/javascripts/stat_graph_spec.js b/spec/javascripts/stat_graph_spec.js
index b589af34610..4c652910cd6 100644
--- a/spec/javascripts/stat_graph_spec.js
+++ b/spec/javascripts/stat_graph_spec.js
@@ -1,3 +1,5 @@
+//= require stat_graph
+
 describe("StatGraph", function () {
 
   describe("#get_log", function () {

From ded7053fbf23dfba167f1d69102be482749a901e Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sat, 18 Apr 2015 15:15:23 -0400
Subject: [PATCH 10/80] Simplify jasmine.yml since we're using jasmine-rails
 gem

A lot of these values are handled by the asset pipeline.
---
 spec/javascripts/support/jasmine.yml | 30 ----------------------------
 1 file changed, 30 deletions(-)

diff --git a/spec/javascripts/support/jasmine.yml b/spec/javascripts/support/jasmine.yml
index b2732921919..f4b01c9f27a 100644
--- a/spec/javascripts/support/jasmine.yml
+++ b/spec/javascripts/support/jasmine.yml
@@ -1,28 +1,3 @@
-# path to parent directory of src_files
-# relative path from Rails.root
-# defaults to app/assets/javascripts
-src_dir: "app/assets/javascripts"
-
-# path to additional directory of source file that are not part of assets pipeline and need to be included
-# relative path from Rails.root
-# defaults to []
-# include_dir:
-#   - ../mobile_app/public/js
-
-# path to parent directory of css_files
-# relative path from Rails.root
-# defaults to app/assets/stylesheets
-css_dir: "app/assets/stylesheets"
-
-# list of file expressions to include as source files
-# relative path from src_dir
-src_files:
- - "application.{js.coffee,js,coffee}"
-
-# list of file expressions to include as css files
-# relative path from css_dir
-css_files:
-
 # path to parent directory of spec_files
 # relative path from Rails.root
 #
@@ -43,8 +18,3 @@ helpers:
 # relative path from spec_dir
 spec_files:
   - "**/*[Ss]pec.{js.coffee,js,coffee}"
-
-# path to directory of temporary files
-# (spec runner and asset cache)
-# defaults to tmp/jasmine
-tmp_dir: "tmp/jasmine"

From 4603bf500ae58ef4af9061ce20b7b33d03dcc783 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sat, 11 Apr 2015 18:30:19 -0400
Subject: [PATCH 11/80] Add 'reply' hotkey to help modal

---
 app/views/help/_shortcuts.html.haml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/views/help/_shortcuts.html.haml b/app/views/help/_shortcuts.html.haml
index fdeab909b76..ae072bacfb1 100644
--- a/app/views/help/_shortcuts.html.haml
+++ b/app/views/help/_shortcuts.html.haml
@@ -187,6 +187,10 @@
                 %td.shortcut
                   .key m
                 %td Change milestone
+              %tr
+                %td.shortcut
+                  .key r
+                %td Reply (quoting selected text)
             %tbody{ class: 'hidden-shortcut merge_requests', style: 'display:none' }
               %tr
                 %th
@@ -199,6 +203,10 @@
                 %td.shortcut
                   .key m
                 %td Change milestone
+              %tr
+                %td.shortcut
+                  .key r
+                %td Reply (quoting selected text)
 
 
 :javascript

From ca5d0c82509cedb94f9bfa4a40e77706a58faafe Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sat, 11 Apr 2015 18:32:24 -0400
Subject: [PATCH 12/80] Add hotkey for "reply with selected text" to Issueable

---
 .../javascripts/shortcuts_issueable.coffee    | 28 ++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/shortcuts_issueable.coffee b/app/assets/javascripts/shortcuts_issueable.coffee
index f2d30eb364d..f645d4ae515 100644
--- a/app/assets/javascripts/shortcuts_issueable.coffee
+++ b/app/assets/javascripts/shortcuts_issueable.coffee
@@ -11,9 +11,35 @@ class @ShortcutsIssueable extends ShortcutsNavigation
       $('.js-milestone').select2('open')
       return false
     )
-    
+    Mousetrap.bind('r', =>
+      @replyWithSelectedText()
+      return false
+    )
+
     if isMergeRequest
       @enabledHelp.push('.hidden-shortcut.merge_requests')
     else
       @enabledHelp.push('.hidden-shortcut.issues')
 
+  replyWithSelectedText: ->
+    if window.getSelection
+      selected = window.getSelection().toString()
+      replyField = $('.js-main-target-form #note_note')
+
+      return if selected.trim() == ""
+
+      # Put a '>' character before each non-empty line in the selection
+      quote = _.map selected.split("\n"), (val) ->
+        "> #{val}\n" if val.trim() != ''
+
+      # If replyField already has some content, add a newline before our quote
+      separator = replyField.val().trim() != "" and "\n" or ''
+
+      replyField.val (_, current) ->
+        current + separator + quote.join('') + "\n"
+
+      # Trigger autosave for the added text
+      replyField.trigger('input')
+
+      # Focus the input field
+      replyField.focus()

From 8e6fa2555ec37f010ac93b43816d8bcdb3ee835c Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sat, 18 Apr 2015 15:16:05 -0400
Subject: [PATCH 13/80] Add JS specs for replyWithSelectedText

---
 .../javascripts/shortcuts_issueable.coffee    |   3 +
 .../shortcuts_issueable_spec.js.coffee        |  83 ++++
 vendor/assets/javascripts/jasmine-fixture.js  | 433 ++++++++++++++++++
 3 files changed, 519 insertions(+)
 create mode 100644 spec/javascripts/shortcuts_issueable_spec.js.coffee
 create mode 100644 vendor/assets/javascripts/jasmine-fixture.js

diff --git a/app/assets/javascripts/shortcuts_issueable.coffee b/app/assets/javascripts/shortcuts_issueable.coffee
index f645d4ae515..939004cbf76 100644
--- a/app/assets/javascripts/shortcuts_issueable.coffee
+++ b/app/assets/javascripts/shortcuts_issueable.coffee
@@ -1,3 +1,6 @@
+#= require jquery
+#= require mousetrap
+
 #= require shortcuts_navigation
 
 class @ShortcutsIssueable extends ShortcutsNavigation
diff --git a/spec/javascripts/shortcuts_issueable_spec.js.coffee b/spec/javascripts/shortcuts_issueable_spec.js.coffee
new file mode 100644
index 00000000000..5f206ddfda6
--- /dev/null
+++ b/spec/javascripts/shortcuts_issueable_spec.js.coffee
@@ -0,0 +1,83 @@
+#= require jquery
+#= require jasmine-fixture
+
+#= require shortcuts_issueable
+
+describe 'ShortcutsIssueable', ->
+  beforeEach ->
+    @shortcut = new ShortcutsIssueable()
+
+  describe '#replyWithSelectedText', ->
+    # Stub window.getSelection to return the provided String.
+    stubSelection = (text) ->
+      window.getSelection = -> text
+
+    beforeEach ->
+      @selector = 'form.js-main-target-form textarea#note_note'
+      affix(@selector)
+
+    describe 'with empty selection', ->
+      it 'does nothing', ->
+        stubSelection('')
+        @shortcut.replyWithSelectedText()
+        expect($(@selector).val()).toBe('')
+
+    describe 'with any selection', ->
+      beforeEach ->
+        stubSelection('Selected text.')
+
+      it 'leaves existing input intact', ->
+        $(@selector).val('This text was already here.')
+        expect($(@selector).val()).toBe('This text was already here.')
+
+        @shortcut.replyWithSelectedText()
+        expect($(@selector).val()).
+          toBe("This text was already here.\n> Selected text.\n\n")
+
+      it 'triggers `input`', ->
+        triggered = false
+        $(@selector).on 'input', -> triggered = true
+        @shortcut.replyWithSelectedText()
+
+        expect(triggered).toBe(true)
+
+      it 'triggers `focus`', ->
+        focused = false
+        $(@selector).on 'focus', -> focused = true
+        @shortcut.replyWithSelectedText()
+
+        expect(focused).toBe(true)
+
+    describe 'with a one-line selection', ->
+      it 'quotes the selection', ->
+        stubSelection('This text has been selected.')
+
+        @shortcut.replyWithSelectedText()
+
+        expect($(@selector).val()).
+          toBe("> This text has been selected.\n\n")
+
+    describe 'with a multi-line selection', ->
+      it 'quotes the selected lines as a group', ->
+        stubSelection(
+          """
+          Selected line one.
+
+          Selected line two.
+          Selected line three.
+
+          """
+        )
+
+        @shortcut.replyWithSelectedText()
+
+        expect($(@selector).val()).
+          toBe(
+            """
+            > Selected line one.
+            > Selected line two.
+            > Selected line three.
+
+
+            """
+          )
diff --git a/vendor/assets/javascripts/jasmine-fixture.js b/vendor/assets/javascripts/jasmine-fixture.js
new file mode 100644
index 00000000000..3815731fd2f
--- /dev/null
+++ b/vendor/assets/javascripts/jasmine-fixture.js
@@ -0,0 +1,433 @@
+/* jasmine-fixture - 1.2.2
+ * Makes injecting HTML snippets into the DOM easy & clean!
+ * https://github.com/searls/jasmine-fixture
+ */
+(function() {
+  var createHTMLBlock,
+    __slice = [].slice;
+
+  (function($) {
+    var ewwSideEffects, jasmineFixture, originalAffix, originalJasmineDotFixture, originalJasmineFixture, root, _, _ref;
+    root = this;
+    originalJasmineFixture = root.jasmineFixture;
+    originalJasmineDotFixture = (_ref = root.jasmine) != null ? _ref.fixture : void 0;
+    originalAffix = root.affix;
+    _ = function(list) {
+      return {
+        inject: function(iterator, memo) {
+          var item, _i, _len, _results;
+          _results = [];
+          for (_i = 0, _len = list.length; _i < _len; _i++) {
+            item = list[_i];
+            _results.push(memo = iterator(memo, item));
+          }
+          return _results;
+        }
+      };
+    };
+    root.jasmineFixture = function($) {
+      var $whatsTheRootOf, affix, create, jasmineFixture, noConflict;
+      affix = function(selectorOptions) {
+        return create.call(this, selectorOptions, true);
+      };
+      create = function(selectorOptions, attach) {
+        var $top;
+        $top = null;
+        _(selectorOptions.split(/[ ](?=[^\]]*?(?:\[|$))/)).inject(function($parent, elementSelector) {
+          var $el;
+          if (elementSelector === ">") {
+            return $parent;
+          }
+          $el = createHTMLBlock($, elementSelector);
+          if (attach || $top) {
+            $el.appendTo($parent);
+          }
+          $top || ($top = $el);
+          return $el;
+        }, $whatsTheRootOf(this));
+        return $top;
+      };
+      noConflict = function() {
+        var currentJasmineFixture, _ref1;
+        currentJasmineFixture = jasmine.fixture;
+        root.jasmineFixture = originalJasmineFixture;
+        if ((_ref1 = root.jasmine) != null) {
+          _ref1.fixture = originalJasmineDotFixture;
+        }
+        root.affix = originalAffix;
+        return currentJasmineFixture;
+      };
+      $whatsTheRootOf = function(that) {
+        if (that.jquery != null) {
+          return that;
+        } else if ($('#jasmine_content').length > 0) {
+          return $('#jasmine_content');
+        } else {
+          return $('<div id="jasmine_content"></div>').appendTo('body');
+        }
+      };
+      jasmineFixture = {
+        affix: affix,
+        create: create,
+        noConflict: noConflict
+      };
+      ewwSideEffects(jasmineFixture);
+      return jasmineFixture;
+    };
+    ewwSideEffects = function(jasmineFixture) {
+      var _ref1;
+      if ((_ref1 = root.jasmine) != null) {
+        _ref1.fixture = jasmineFixture;
+      }
+      $.fn.affix = root.affix = jasmineFixture.affix;
+      return afterEach(function() {
+        return $('#jasmine_content').remove();
+      });
+    };
+    if ($) {
+      return jasmineFixture = root.jasmineFixture($);
+    } else {
+      return root.affix = function() {
+        var nowJQueryExists;
+        nowJQueryExists = window.jQuery || window.$;
+        if (nowJQueryExists != null) {
+          jasmineFixture = root.jasmineFixture(nowJQueryExists);
+          return affix.call.apply(affix, [this].concat(__slice.call(arguments)));
+        } else {
+          throw new Error("jasmine-fixture requires jQuery to be defined at window.jQuery or window.$");
+        }
+      };
+    }
+  })(window.jQuery || window.$);
+
+  createHTMLBlock = (function() {
+    var bindData, bindEvents, parseAttributes, parseClasses, parseContents, parseEnclosure, parseReferences, parseVariableScope, regAttr, regAttrDfn, regAttrs, regCBrace, regClass, regClasses, regData, regDatas, regEvent, regEvents, regExclamation, regId, regReference, regTag, regTagNotContent, regZenTagDfn;
+    createHTMLBlock = function($, ZenObject, data, functions, indexes) {
+      var ZenCode, arr, block, blockAttrs, blockClasses, blockHTML, blockId, blockTag, blocks, el, el2, els, forScope, indexName, inner, len, obj, origZenCode, paren, result, ret, zc, zo;
+      if ($.isPlainObject(ZenObject)) {
+        ZenCode = ZenObject.main;
+      } else {
+        ZenCode = ZenObject;
+        ZenObject = {
+          main: ZenCode
+        };
+      }
+      origZenCode = ZenCode;
+      if (indexes === undefined) {
+        indexes = {};
+      }
+      if (ZenCode.charAt(0) === "!" || $.isArray(data)) {
+        if ($.isArray(data)) {
+          forScope = ZenCode;
+        } else {
+          obj = parseEnclosure(ZenCode, "!");
+          obj = obj.substring(obj.indexOf(":") + 1, obj.length - 1);
+          forScope = parseVariableScope(ZenCode);
+        }
+        while (forScope.charAt(0) === "@") {
+          forScope = parseVariableScope("!for:!" + parseReferences(forScope, ZenObject));
+        }
+        zo = ZenObject;
+        zo.main = forScope;
+        el = $();
+        if (ZenCode.substring(0, 5) === "!for:" || $.isArray(data)) {
+          if (!$.isArray(data) && obj.indexOf(":") > 0) {
+            indexName = obj.substring(0, obj.indexOf(":"));
+            obj = obj.substr(obj.indexOf(":") + 1);
+          }
+          arr = ($.isArray(data) ? data : data[obj]);
+          zc = zo.main;
+          if ($.isArray(arr) || $.isPlainObject(arr)) {
+            $.map(arr, function(value, index) {
+              var next;
+              zo.main = zc;
+              if (indexName !== undefined) {
+                indexes[indexName] = index;
+              }
+              if (!$.isPlainObject(value)) {
+                value = {
+                  value: value
+                };
+              }
+              next = createHTMLBlock($, zo, value, functions, indexes);
+              if (el.length !== 0) {
+                return $.each(next, function(index, value) {
+                  return el.push(value);
+                });
+              }
+            });
+          }
+          if (!$.isArray(data)) {
+            ZenCode = ZenCode.substr(obj.length + 6 + forScope.length);
+          } else {
+            ZenCode = "";
+          }
+        } else if (ZenCode.substring(0, 4) === "!if:") {
+          result = parseContents("!" + obj + "!", data, indexes);
+          if (result !== "undefined" || result !== "false" || result !== "") {
+            el = createHTMLBlock($, zo, data, functions, indexes);
+          }
+          ZenCode = ZenCode.substr(obj.length + 5 + forScope.length);
+        }
+        ZenObject.main = ZenCode;
+      } else if (ZenCode.charAt(0) === "(") {
+        paren = parseEnclosure(ZenCode, "(", ")");
+        inner = paren.substring(1, paren.length - 1);
+        ZenCode = ZenCode.substr(paren.length);
+        zo = ZenObject;
+        zo.main = inner;
+        el = createHTMLBlock($, zo, data, functions, indexes);
+      } else {
+        blocks = ZenCode.match(regZenTagDfn);
+        block = blocks[0];
+        if (block.length === 0) {
+          return "";
+        }
+        if (block.indexOf("@") >= 0) {
+          ZenCode = parseReferences(ZenCode, ZenObject);
+          zo = ZenObject;
+          zo.main = ZenCode;
+          return createHTMLBlock($, zo, data, functions, indexes);
+        }
+        block = parseContents(block, data, indexes);
+        blockClasses = parseClasses($, block);
+        if (regId.test(block)) {
+          blockId = regId.exec(block)[1];
+        }
+        blockAttrs = parseAttributes(block, data);
+        blockTag = (block.charAt(0) === "{" ? "span" : "div");
+        if (ZenCode.charAt(0) !== "#" && ZenCode.charAt(0) !== "." && ZenCode.charAt(0) !== "{") {
+          blockTag = regTag.exec(block)[1];
+        }
+        if (block.search(regCBrace) !== -1) {
+          blockHTML = block.match(regCBrace)[1];
+        }
+        blockAttrs = $.extend(blockAttrs, {
+          id: blockId,
+          "class": blockClasses,
+          html: blockHTML
+        });
+        el = $("<" + blockTag + ">", blockAttrs);
+        el.attr(blockAttrs);
+        el = bindEvents(block, el, functions);
+        el = bindData(block, el, data);
+        ZenCode = ZenCode.substr(blocks[0].length);
+        ZenObject.main = ZenCode;
+      }
+      if (ZenCode.length > 0) {
+        if (ZenCode.charAt(0) === ">") {
+          if (ZenCode.charAt(1) === "(") {
+            zc = parseEnclosure(ZenCode.substr(1), "(", ")");
+            ZenCode = ZenCode.substr(zc.length + 1);
+          } else if (ZenCode.charAt(1) === "!") {
+            obj = parseEnclosure(ZenCode.substr(1), "!");
+            forScope = parseVariableScope(ZenCode.substr(1));
+            zc = obj + forScope;
+            ZenCode = ZenCode.substr(zc.length + 1);
+          } else {
+            len = Math.max(ZenCode.indexOf("+"), ZenCode.length);
+            zc = ZenCode.substring(1, len);
+            ZenCode = ZenCode.substr(len);
+          }
+          zo = ZenObject;
+          zo.main = zc;
+          els = $(createHTMLBlock($, zo, data, functions, indexes));
+          els.appendTo(el);
+        }
+        if (ZenCode.charAt(0) === "+") {
+          zo = ZenObject;
+          zo.main = ZenCode.substr(1);
+          el2 = createHTMLBlock($, zo, data, functions, indexes);
+          $.each(el2, function(index, value) {
+            return el.push(value);
+          });
+        }
+      }
+      ret = el;
+      return ret;
+    };
+    bindData = function(ZenCode, el, data) {
+      var datas, i, split;
+      if (ZenCode.search(regDatas) === 0) {
+        return el;
+      }
+      datas = ZenCode.match(regDatas);
+      if (datas === null) {
+        return el;
+      }
+      i = 0;
+      while (i < datas.length) {
+        split = regData.exec(datas[i]);
+        if (split[3] === undefined) {
+          $(el).data(split[1], data[split[1]]);
+        } else {
+          $(el).data(split[1], data[split[3]]);
+        }
+        i++;
+      }
+      return el;
+    };
+    bindEvents = function(ZenCode, el, functions) {
+      var bindings, fn, i, split;
+      if (ZenCode.search(regEvents) === 0) {
+        return el;
+      }
+      bindings = ZenCode.match(regEvents);
+      if (bindings === null) {
+        return el;
+      }
+      i = 0;
+      while (i < bindings.length) {
+        split = regEvent.exec(bindings[i]);
+        if (split[2] === undefined) {
+          fn = functions[split[1]];
+        } else {
+          fn = functions[split[2]];
+        }
+        $(el).bind(split[1], fn);
+        i++;
+      }
+      return el;
+    };
+    parseAttributes = function(ZenBlock, data) {
+      var attrStrs, attrs, i, parts;
+      if (ZenBlock.search(regAttrDfn) === -1) {
+        return undefined;
+      }
+      attrStrs = ZenBlock.match(regAttrDfn);
+      attrs = {};
+      i = 0;
+      while (i < attrStrs.length) {
+        parts = regAttr.exec(attrStrs[i]);
+        attrs[parts[1]] = "";
+        if (parts[3] !== undefined) {
+          attrs[parts[1]] = parseContents(parts[3], data);
+        }
+        i++;
+      }
+      return attrs;
+    };
+    parseClasses = function($, ZenBlock) {
+      var classes, clsString, i;
+      ZenBlock = ZenBlock.match(regTagNotContent)[0];
+      if (ZenBlock.search(regClasses) === -1) {
+        return undefined;
+      }
+      classes = ZenBlock.match(regClasses);
+      clsString = "";
+      i = 0;
+      while (i < classes.length) {
+        clsString += " " + regClass.exec(classes[i])[1];
+        i++;
+      }
+      return $.trim(clsString);
+    };
+    parseContents = function(ZenBlock, data, indexes) {
+      var html;
+      if (indexes === undefined) {
+        indexes = {};
+      }
+      html = ZenBlock;
+      if (data === undefined) {
+        return html;
+      }
+      while (regExclamation.test(html)) {
+        html = html.replace(regExclamation, function(str, str2) {
+          var begChar, fn, val;
+          begChar = "";
+          if (str.indexOf("!for:") > 0 || str.indexOf("!if:") > 0) {
+            return str;
+          }
+          if (str.charAt(0) !== "!") {
+            begChar = str.charAt(0);
+            str = str.substring(2, str.length - 1);
+          }
+          fn = new Function("data", "indexes", "var r=undefined;" + "with(data){try{r=" + str + ";}catch(e){}}" + "with(indexes){try{if(r===undefined)r=" + str + ";}catch(e){}}" + "return r;");
+          val = unescape(fn(data, indexes));
+          return begChar + val;
+        });
+      }
+      html = html.replace(/\\./g, function(str) {
+        return str.charAt(1);
+      });
+      return unescape(html);
+    };
+    parseEnclosure = function(ZenCode, open, close, count) {
+      var index, ret;
+      if (close === undefined) {
+        close = open;
+      }
+      index = 1;
+      if (count === undefined) {
+        count = (ZenCode.charAt(0) === open ? 1 : 0);
+      }
+      if (count === 0) {
+        return;
+      }
+      while (count > 0 && index < ZenCode.length) {
+        if (ZenCode.charAt(index) === close && ZenCode.charAt(index - 1) !== "\\") {
+          count--;
+        } else {
+          if (ZenCode.charAt(index) === open && ZenCode.charAt(index - 1) !== "\\") {
+            count++;
+          }
+        }
+        index++;
+      }
+      ret = ZenCode.substring(0, index);
+      return ret;
+    };
+    parseReferences = function(ZenCode, ZenObject) {
+      ZenCode = ZenCode.replace(regReference, function(str) {
+        var fn;
+        str = str.substr(1);
+        fn = new Function("objs", "var r=\"\";" + "with(objs){try{" + "r=" + str + ";" + "}catch(e){}}" + "return r;");
+        return fn(ZenObject, parseReferences);
+      });
+      return ZenCode;
+    };
+    parseVariableScope = function(ZenCode) {
+      var forCode, rest, tag;
+      if (ZenCode.substring(0, 5) !== "!for:" && ZenCode.substring(0, 4) !== "!if:") {
+        return undefined;
+      }
+      forCode = parseEnclosure(ZenCode, "!");
+      ZenCode = ZenCode.substr(forCode.length);
+      if (ZenCode.charAt(0) === "(") {
+        return parseEnclosure(ZenCode, "(", ")");
+      }
+      tag = ZenCode.match(regZenTagDfn)[0];
+      ZenCode = ZenCode.substr(tag.length);
+      if (ZenCode.length === 0 || ZenCode.charAt(0) === "+") {
+        return tag;
+      } else if (ZenCode.charAt(0) === ">") {
+        rest = "";
+        rest = parseEnclosure(ZenCode.substr(1), "(", ")", 1);
+        return tag + ">" + rest;
+      }
+      return undefined;
+    };
+    regZenTagDfn = /([#\.\@]?[\w-]+|\[([\w-!?=:"']+(="([^"]|\\")+")? {0,})+\]|\~[\w$]+=[\w$]+|&[\w$]+(=[\w$]+)?|[#\.\@]?!([^!]|\\!)+!){0,}(\{([^\}]|\\\})+\})?/i;
+    regTag = /(\w+)/i;
+    regId = /(?:^|\b)#([\w-!]+)/i;
+    regTagNotContent = /((([#\.]?[\w-]+)?(\[([\w!]+(="([^"]|\\")+")? {0,})+\])?)+)/i;
+    /*
+     See lookahead syntax (?!) at https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp
+    */
+
+    regClasses = /(\.[\w-]+)(?!["\w])/g;
+    regClass = /\.([\w-]+)/i;
+    regReference = /(@[\w$_][\w$_\d]+)/i;
+    regAttrDfn = /(\[([\w-!]+(="?([^"]|\\")+"?)? {0,})+\])/ig;
+    regAttrs = /([\w-!]+(="([^"]|\\")+")?)/g;
+    regAttr = /([\w-!]+)(="?((([\w]+(\[.*?\])+)|[^"\]]|\\")+)"?)?/i;
+    regCBrace = /\{(([^\}]|\\\})+)\}/i;
+    regExclamation = /(?:([^\\]|^))!([^!]|\\!)+!/g;
+    regEvents = /\~[\w$]+(=[\w$]+)?/g;
+    regEvent = /\~([\w$]+)=([\w$]+)/i;
+    regDatas = /&[\w$]+(=[\w$]+)?/g;
+    regData = /&([\w$]+)(=([\w$]+))?/i;
+    return createHTMLBlock;
+  })();
+
+}).call(this);

From 4d1878253e228db55485dae9e4ad66aebe009040 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sat, 18 Apr 2015 15:20:15 -0400
Subject: [PATCH 14/80] Typo: Issueable -> Issuable

---
 app/assets/javascripts/application.js.coffee                | 2 +-
 app/assets/javascripts/dispatcher.js.coffee                 | 4 ++--
 ...shortcuts_issueable.coffee => shortcuts_issuable.coffee} | 2 +-
 ...ble_spec.js.coffee => shortcuts_issuable_spec.js.coffee} | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename app/assets/javascripts/{shortcuts_issueable.coffee => shortcuts_issuable.coffee} (95%)
 rename spec/javascripts/{shortcuts_issueable_spec.js.coffee => shortcuts_issuable_spec.js.coffee} (95%)

diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index bd52d3d4d70..1a71f853b4d 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -38,7 +38,7 @@
 #= require shortcuts
 #= require shortcuts_navigation
 #= require shortcuts_dashboard_navigation
-#= require shortcuts_issueable
+#= require shortcuts_issuable
 #= require shortcuts_network
 #= require cal-heatmap
 #= require_tree .
diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee
index 330ebac6f75..9aee3b281f3 100644
--- a/app/assets/javascripts/dispatcher.js.coffee
+++ b/app/assets/javascripts/dispatcher.js.coffee
@@ -22,7 +22,7 @@ class Dispatcher
         shortcut_handler = new ShortcutsNavigation()
       when 'projects:issues:show'
         new Issue()
-        shortcut_handler = new ShortcutsIssueable()
+        shortcut_handler = new ShortcutsIssuable()
         new ZenMode()
       when 'projects:milestones:show'
         new Milestone()
@@ -47,7 +47,7 @@ class Dispatcher
           new IssuableForm($('.merge-request-form'))
       when 'projects:merge_requests:show'
         new Diff()
-        shortcut_handler = new ShortcutsIssueable()
+        shortcut_handler = new ShortcutsIssuable()
         new ZenMode()
       when "projects:merge_requests:diffs"
         new Diff()
diff --git a/app/assets/javascripts/shortcuts_issueable.coffee b/app/assets/javascripts/shortcuts_issuable.coffee
similarity index 95%
rename from app/assets/javascripts/shortcuts_issueable.coffee
rename to app/assets/javascripts/shortcuts_issuable.coffee
index 939004cbf76..6b534f29218 100644
--- a/app/assets/javascripts/shortcuts_issueable.coffee
+++ b/app/assets/javascripts/shortcuts_issuable.coffee
@@ -3,7 +3,7 @@
 
 #= require shortcuts_navigation
 
-class @ShortcutsIssueable extends ShortcutsNavigation
+class @ShortcutsIssuable extends ShortcutsNavigation
   constructor: (isMergeRequest) ->
     super()
     Mousetrap.bind('a', ->
diff --git a/spec/javascripts/shortcuts_issueable_spec.js.coffee b/spec/javascripts/shortcuts_issuable_spec.js.coffee
similarity index 95%
rename from spec/javascripts/shortcuts_issueable_spec.js.coffee
rename to spec/javascripts/shortcuts_issuable_spec.js.coffee
index 5f206ddfda6..57dcc2161d3 100644
--- a/spec/javascripts/shortcuts_issueable_spec.js.coffee
+++ b/spec/javascripts/shortcuts_issuable_spec.js.coffee
@@ -1,11 +1,11 @@
 #= require jquery
 #= require jasmine-fixture
 
-#= require shortcuts_issueable
+#= require shortcuts_issuable
 
-describe 'ShortcutsIssueable', ->
+describe 'ShortcutsIssuable', ->
   beforeEach ->
-    @shortcut = new ShortcutsIssueable()
+    @shortcut = new ShortcutsIssuable()
 
   describe '#replyWithSelectedText', ->
     # Stub window.getSelection to return the provided String.

From 3ae0b8853b6f1169e0341c091d8a4e1b13aac3ad Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sat, 18 Apr 2015 18:49:33 -0400
Subject: [PATCH 15/80] Add changelog entry [ci skip]

---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index adcc3b96d11..508025a3f57 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,7 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date.
 v 7.11.0 (unreleased)
   - Fix clone URL field and X11 Primary selection (Dmitry Medvinsky)
   - Ignore invalid lines in .gitmodules
-  -
+  - Add "Reply quoting selected text" shortcut key (`r`)
   -
   -
   -

From 5a4ebfb47af40de6cfe29fe59dae82f8c244e5e3 Mon Sep 17 00:00:00 2001
From: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
Date: Thu, 16 Apr 2015 14:03:37 +0200
Subject: [PATCH 16/80] Fixed the Rails/ActionFilter cop

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
---
 .rubocop.yml                                   |  2 +-
 .../admin/application_controller.rb            |  2 +-
 .../admin/application_settings_controller.rb   |  2 +-
 .../admin/broadcast_messages_controller.rb     |  2 +-
 .../admin/deploy_keys_controller.rb            |  6 +++---
 app/controllers/admin/groups_controller.rb     |  2 +-
 app/controllers/admin/keys_controller.rb       |  2 +-
 app/controllers/admin/projects_controller.rb   |  6 +++---
 app/controllers/admin/services_controller.rb   |  2 +-
 app/controllers/admin/users_controller.rb      |  2 +-
 app/controllers/application_controller.rb      | 18 +++++++++---------
 .../dashboard/milestones_controller.rb         |  2 +-
 .../dashboard/projects_controller.rb           |  2 +-
 app/controllers/dashboard_controller.rb        |  4 ++--
 app/controllers/explore/groups_controller.rb   |  2 +-
 app/controllers/explore/projects_controller.rb |  2 +-
 .../groups/group_members_controller.rb         | 12 ++++++------
 .../groups/milestones_controller.rb            |  2 +-
 app/controllers/groups_controller.rb           | 16 ++++++++--------
 app/controllers/import/bitbucket_controller.rb | 12 ++++++------
 app/controllers/import/github_controller.rb    |  6 +++---
 app/controllers/import/gitlab_controller.rb    |  8 ++++----
 .../import/google_code_controller.rb           |  6 +++---
 app/controllers/invites_controller.rb          |  8 ++++----
 app/controllers/namespaces_controller.rb       |  2 +-
 .../oauth/applications_controller.rb           |  4 ++--
 .../oauth/authorizations_controller.rb         |  2 +-
 app/controllers/profiles/keys_controller.rb    |  2 +-
 .../profiles/passwords_controller.rb           |  8 ++++----
 app/controllers/profiles_controller.rb         |  6 +++---
 .../projects/application_controller.rb         |  4 ++--
 app/controllers/projects/avatars_controller.rb |  2 +-
 app/controllers/projects/blame_controller.rb   |  6 +++---
 app/controllers/projects/blob_controller.rb    | 18 +++++++++---------
 .../projects/branches_controller.rb            |  6 +++---
 app/controllers/projects/commit_controller.rb  |  6 +++---
 app/controllers/projects/commits_controller.rb |  6 +++---
 app/controllers/projects/compare_controller.rb |  4 ++--
 .../projects/deploy_keys_controller.rb         |  2 +-
 app/controllers/projects/forks_controller.rb   |  4 ++--
 app/controllers/projects/graphs_controller.rb  |  4 ++--
 app/controllers/projects/hooks_controller.rb   |  2 +-
 app/controllers/projects/imports_controller.rb |  6 +++---
 app/controllers/projects/issues_controller.rb  | 14 +++++++-------
 app/controllers/projects/labels_controller.rb  |  8 ++++----
 .../projects/merge_requests_controller.rb      | 18 +++++++++---------
 .../projects/milestones_controller.rb          |  8 ++++----
 app/controllers/projects/network_controller.rb |  6 +++---
 app/controllers/projects/notes_controller.rb   |  8 ++++----
 .../projects/project_members_controller.rb     |  6 +++---
 .../projects/protected_branches_controller.rb  |  4 ++--
 app/controllers/projects/raw_controller.rb     |  6 +++---
 app/controllers/projects/refs_controller.rb    |  6 +++---
 .../projects/repositories_controller.rb        |  6 +++---
 .../projects/services_controller.rb            |  4 ++--
 .../projects/snippets_controller.rb            | 12 ++++++------
 app/controllers/projects/tags_controller.rb    |  8 ++++----
 app/controllers/projects/tree_controller.rb    |  6 +++---
 app/controllers/projects/uploads_controller.rb |  8 ++++----
 app/controllers/projects/wikis_controller.rb   |  8 ++++----
 app/controllers/projects_controller.rb         | 12 ++++++------
 app/controllers/registrations_controller.rb    |  2 +-
 app/controllers/snippets_controller.rb         | 10 +++++-----
 app/controllers/uploads_controller.rb          |  6 +++---
 app/controllers/users_controller.rb            |  4 ++--
 db/schema.rb                                   |  2 +-
 66 files changed, 197 insertions(+), 197 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 03b78d68840..0cc729d3b08 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -954,7 +954,7 @@ Lint/Void:
 
 Rails/ActionFilter:
   Description: 'Enforces consistent use of action filter methods.'
-  Enabled: false
+  Enabled: true
 
 Rails/DefaultScope:
   Description: 'Checks if the argument passed to default_scope is a block.'
diff --git a/app/controllers/admin/application_controller.rb b/app/controllers/admin/application_controller.rb
index 6a8f20f6047..fe5456f820c 100644
--- a/app/controllers/admin/application_controller.rb
+++ b/app/controllers/admin/application_controller.rb
@@ -3,7 +3,7 @@
 # Automatically sets the layout and ensures an administrator is logged in
 class Admin::ApplicationController < ApplicationController
   layout 'admin'
-  before_filter :authenticate_admin!
+  before_action :authenticate_admin!
 
   def authenticate_admin!
     return render_404 unless current_user.is_admin?
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index b5fda196bf0..e9757676908 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -1,5 +1,5 @@
 class Admin::ApplicationSettingsController < Admin::ApplicationController
-  before_filter :set_application_setting
+  before_action :set_application_setting
 
   def show
   end
diff --git a/app/controllers/admin/broadcast_messages_controller.rb b/app/controllers/admin/broadcast_messages_controller.rb
index e1643bb34bf..0808024fc39 100644
--- a/app/controllers/admin/broadcast_messages_controller.rb
+++ b/app/controllers/admin/broadcast_messages_controller.rb
@@ -1,5 +1,5 @@
 class Admin::BroadcastMessagesController < Admin::ApplicationController
-  before_filter :broadcast_messages
+  before_action :broadcast_messages
 
   def index
     @broadcast_message = BroadcastMessage.new
diff --git a/app/controllers/admin/deploy_keys_controller.rb b/app/controllers/admin/deploy_keys_controller.rb
index e93603bef36..c301e61d1c7 100644
--- a/app/controllers/admin/deploy_keys_controller.rb
+++ b/app/controllers/admin/deploy_keys_controller.rb
@@ -1,13 +1,13 @@
 class Admin::DeployKeysController < Admin::ApplicationController
-  before_filter :deploy_keys, only: [:index]
-  before_filter :deploy_key, only: [:show, :destroy]
+  before_action :deploy_keys, only: [:index]
+  before_action :deploy_key, only: [:show, :destroy]
 
   def index
 
   end
 
   def show
-    
+
   end
 
   def new
diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index 22d045fc388..2dfae13ac5c 100644
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -1,5 +1,5 @@
 class Admin::GroupsController < Admin::ApplicationController
-  before_filter :group, only: [:edit, :show, :update, :destroy, :project_update, :members_update]
+  before_action :group, only: [:edit, :show, :update, :destroy, :project_update, :members_update]
 
   def index
     @groups = Group.all
diff --git a/app/controllers/admin/keys_controller.rb b/app/controllers/admin/keys_controller.rb
index 21111bb44f5..cb33fdd9763 100644
--- a/app/controllers/admin/keys_controller.rb
+++ b/app/controllers/admin/keys_controller.rb
@@ -1,5 +1,5 @@
 class Admin::KeysController < Admin::ApplicationController
-  before_filter :user, only: [:show, :destroy]
+  before_action :user, only: [:show, :destroy]
 
   def show
     @key = user.keys.find(params[:id])
diff --git a/app/controllers/admin/projects_controller.rb b/app/controllers/admin/projects_controller.rb
index 5176a8399ae..ee449badf59 100644
--- a/app/controllers/admin/projects_controller.rb
+++ b/app/controllers/admin/projects_controller.rb
@@ -1,7 +1,7 @@
 class Admin::ProjectsController < Admin::ApplicationController
-  before_filter :project, only: [:show, :transfer]
-  before_filter :group, only: [:show, :transfer]
-  before_filter :repository, only: [:show, :transfer]
+  before_action :project, only: [:show, :transfer]
+  before_action :group, only: [:show, :transfer]
+  before_action :repository, only: [:show, :transfer]
 
   def index
     @projects = Project.all
diff --git a/app/controllers/admin/services_controller.rb b/app/controllers/admin/services_controller.rb
index 76a938c5fe4..c1fdcd7fab6 100644
--- a/app/controllers/admin/services_controller.rb
+++ b/app/controllers/admin/services_controller.rb
@@ -1,5 +1,5 @@
 class Admin::ServicesController < Admin::ApplicationController
-  before_filter :service, only: [:edit, :update]
+  before_action :service, only: [:edit, :update]
 
   def index
     @services = services_templates
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index b4c011f213c..adb83996f8b 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -1,5 +1,5 @@
 class Admin::UsersController < Admin::ApplicationController
-  before_filter :user, only: [:show, :edit, :update, :destroy]
+  before_action :user, only: [:show, :edit, :update, :destroy]
 
   def index
     @users = User.order_name_asc.filter(params[:filter])
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 920a981e7c9..8ddb424dcfb 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -6,15 +6,15 @@ class ApplicationController < ActionController::Base
 
   PER_PAGE = 20
 
-  before_filter :authenticate_user_from_token!
-  before_filter :authenticate_user!
-  before_filter :reject_blocked!
-  before_filter :check_password_expiration
-  before_filter :ldap_security_check
-  before_filter :default_headers
-  before_filter :add_gon_variables
-  before_filter :configure_permitted_parameters, if: :devise_controller?
-  before_filter :require_email, unless: :devise_controller?
+  before_action :authenticate_user_from_token!
+  before_action :authenticate_user!
+  before_action :reject_blocked!
+  before_action :check_password_expiration
+  before_action :ldap_security_check
+  before_action :default_headers
+  before_action :add_gon_variables
+  before_action :configure_permitted_parameters, if: :devise_controller?
+  before_action :require_email, unless: :devise_controller?
 
   protect_from_forgery with: :exception
 
diff --git a/app/controllers/dashboard/milestones_controller.rb b/app/controllers/dashboard/milestones_controller.rb
index cb51792df16..33227e7f1d8 100644
--- a/app/controllers/dashboard/milestones_controller.rb
+++ b/app/controllers/dashboard/milestones_controller.rb
@@ -1,5 +1,5 @@
 class Dashboard::MilestonesController < ApplicationController
-  before_filter :load_projects
+  before_action :load_projects
 
   def index
     project_milestones = case params[:state]
diff --git a/app/controllers/dashboard/projects_controller.rb b/app/controllers/dashboard/projects_controller.rb
index 56e6fcc41ca..426bc615415 100644
--- a/app/controllers/dashboard/projects_controller.rb
+++ b/app/controllers/dashboard/projects_controller.rb
@@ -1,5 +1,5 @@
 class Dashboard::ProjectsController < ApplicationController
-  before_filter :event_filter
+  before_action :event_filter
 
   def starred
     @projects = current_user.starred_projects
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index 9bd853ed5c7..40b5de1295a 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -1,8 +1,8 @@
 class DashboardController < ApplicationController
   respond_to :html
 
-  before_filter :load_projects, except: [:projects]
-  before_filter :event_filter, only: :show
+  before_action :load_projects, except: [:projects]
+  before_action :event_filter, only: :show
 
   def show
     @projects = @projects.includes(:namespace)
diff --git a/app/controllers/explore/groups_controller.rb b/app/controllers/explore/groups_controller.rb
index c51a4a211a6..a7250b799f3 100644
--- a/app/controllers/explore/groups_controller.rb
+++ b/app/controllers/explore/groups_controller.rb
@@ -1,5 +1,5 @@
 class Explore::GroupsController < ApplicationController
-  skip_before_filter :authenticate_user!,
+  skip_before_action :authenticate_user!,
                      :reject_blocked, :set_current_user_for_observers
 
   layout "explore"
diff --git a/app/controllers/explore/projects_controller.rb b/app/controllers/explore/projects_controller.rb
index b295f295bb1..b1b0a2514dc 100644
--- a/app/controllers/explore/projects_controller.rb
+++ b/app/controllers/explore/projects_controller.rb
@@ -1,5 +1,5 @@
 class Explore::ProjectsController < ApplicationController
-  skip_before_filter :authenticate_user!,
+  skip_before_action :authenticate_user!,
                      :reject_blocked
 
   layout 'explore'
diff --git a/app/controllers/groups/group_members_controller.rb b/app/controllers/groups/group_members_controller.rb
index 265cf4f0f4a..5648a652e8e 100644
--- a/app/controllers/groups/group_members_controller.rb
+++ b/app/controllers/groups/group_members_controller.rb
@@ -1,10 +1,10 @@
 class Groups::GroupMembersController < Groups::ApplicationController
-  skip_before_filter :authenticate_user!, only: [:index]
-  before_filter :group
+  skip_before_action :authenticate_user!, only: [:index]
+  before_action :group
 
   # Authorize
-  before_filter :authorize_read_group!
-  before_filter :authorize_admin_group!, except: [:index, :leave]
+  before_action :authorize_read_group!
+  before_action :authorize_admin_group!, except: [:index, :leave]
 
   layout :determine_layout
 
@@ -49,7 +49,7 @@ class Groups::GroupMembersController < Groups::ApplicationController
 
   def resend_invite
     redirect_path = group_group_members_path(@group)
-    
+
     @group_member = @group.group_members.find(params[:id])
 
     if @group_member.invite?
@@ -63,7 +63,7 @@ class Groups::GroupMembersController < Groups::ApplicationController
 
   def leave
     @group_member = @group.group_members.where(user_id: current_user.id).first
-    
+
     if can?(current_user, :destroy_group_member, @group_member)
       @group_member.destroy
       redirect_to(dashboard_groups_path, notice: "You left #{group.name} group.")
diff --git a/app/controllers/groups/milestones_controller.rb b/app/controllers/groups/milestones_controller.rb
index 546ff2cc71f..41564b04a92 100644
--- a/app/controllers/groups/milestones_controller.rb
+++ b/app/controllers/groups/milestones_controller.rb
@@ -1,7 +1,7 @@
 class Groups::MilestonesController < ApplicationController
   layout 'group'
 
-  before_filter :authorize_group_milestone!, only: :update
+  before_action :authorize_group_milestone!, only: :update
 
   def index
     project_milestones = case params[:state]
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 7af3c077182..294af0b1704 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -1,17 +1,17 @@
 class GroupsController < Groups::ApplicationController
-  skip_before_filter :authenticate_user!, only: [:show, :issues, :merge_requests]
+  skip_before_action :authenticate_user!, only: [:show, :issues, :merge_requests]
   respond_to :html
-  before_filter :group, except: [:new, :create]
+  before_action :group, except: [:new, :create]
 
   # Authorize
-  before_filter :authorize_read_group!, except: [:new, :create]
-  before_filter :authorize_admin_group!, only: [:edit, :update, :destroy, :projects]
-  before_filter :authorize_create_group!, only: [:new, :create]
+  before_action :authorize_read_group!, except: [:new, :create]
+  before_action :authorize_admin_group!, only: [:edit, :update, :destroy, :projects]
+  before_action :authorize_create_group!, only: [:new, :create]
 
   # Load group projects
-  before_filter :load_projects, except: [:new, :create, :projects, :edit, :update]
-  before_filter :event_filter, only: :show
-  before_filter :set_title, only: [:new, :create]
+  before_action :load_projects, except: [:new, :create, :projects, :edit, :update]
+  before_action :event_filter, only: :show
+  before_action :set_title, only: [:new, :create]
 
   layout :determine_layout
 
diff --git a/app/controllers/import/bitbucket_controller.rb b/app/controllers/import/bitbucket_controller.rb
index bb8d7e0235c..ca78a4aaa8e 100644
--- a/app/controllers/import/bitbucket_controller.rb
+++ b/app/controllers/import/bitbucket_controller.rb
@@ -1,15 +1,15 @@
 class Import::BitbucketController < Import::BaseController
-  before_filter :verify_bitbucket_import_enabled
-  before_filter :bitbucket_auth, except: :callback
+  before_action :verify_bitbucket_import_enabled
+  before_action :bitbucket_auth, except: :callback
 
   rescue_from OAuth::Error, with: :bitbucket_unauthorized
 
   def callback
-    request_token = session.delete(:oauth_request_token) 
+    request_token = session.delete(:oauth_request_token)
     raise "Session expired!" if request_token.nil?
 
     request_token.symbolize_keys!
-    
+
     access_token = client.get_token(request_token, params[:oauth_verifier], callback_import_bitbucket_url)
 
     current_user.bitbucket_access_token = access_token.token
@@ -21,7 +21,7 @@ class Import::BitbucketController < Import::BaseController
 
   def status
     @repos = client.projects
-    
+
     @already_added_projects = current_user.created_projects.where(import_type: "bitbucket")
     already_added_projects_names = @already_added_projects.pluck(:import_source)
 
@@ -41,7 +41,7 @@ class Import::BitbucketController < Import::BaseController
     repo_owner = repo["owner"]
     repo_owner = current_user.username if repo_owner == client.user["user"]["username"]
     @target_namespace = params[:new_namespace].presence || repo_owner
-    
+
     namespace = get_or_create_namespace || (render and return)
 
     unless Gitlab::BitbucketImport::KeyAdder.new(repo, current_user).execute
diff --git a/app/controllers/import/github_controller.rb b/app/controllers/import/github_controller.rb
index 87b41454c77..b9f99c1b88a 100644
--- a/app/controllers/import/github_controller.rb
+++ b/app/controllers/import/github_controller.rb
@@ -1,6 +1,6 @@
 class Import::GithubController < Import::BaseController
-  before_filter :verify_github_import_enabled
-  before_filter :github_auth, except: :callback
+  before_action :verify_github_import_enabled
+  before_action :github_auth, except: :callback
 
   rescue_from Octokit::Unauthorized, with: :github_unauthorized
 
@@ -36,7 +36,7 @@ class Import::GithubController < Import::BaseController
     repo_owner = repo.owner.login
     repo_owner = current_user.username if repo_owner == client.user.login
     @target_namespace = params[:new_namespace].presence || repo_owner
-    
+
     namespace = get_or_create_namespace || (render and return)
 
     @project = Gitlab::GithubImport::ProjectCreator.new(repo, namespace, current_user).execute
diff --git a/app/controllers/import/gitlab_controller.rb b/app/controllers/import/gitlab_controller.rb
index bddbfded812..1b8962d8924 100644
--- a/app/controllers/import/gitlab_controller.rb
+++ b/app/controllers/import/gitlab_controller.rb
@@ -1,6 +1,6 @@
 class Import::GitlabController < Import::BaseController
-  before_filter :verify_gitlab_import_enabled
-  before_filter :gitlab_auth, except: :callback
+  before_action :verify_gitlab_import_enabled
+  before_action :gitlab_auth, except: :callback
 
   rescue_from OAuth2::Error, with: :gitlab_unauthorized
 
@@ -13,7 +13,7 @@ class Import::GitlabController < Import::BaseController
 
   def status
     @repos = client.projects
-    
+
     @already_added_projects = current_user.created_projects.where(import_type: "gitlab")
     already_added_projects_names = @already_added_projects.pluck(:import_source)
 
@@ -33,7 +33,7 @@ class Import::GitlabController < Import::BaseController
     repo_owner = repo["namespace"]["path"]
     repo_owner = current_user.username if repo_owner == client.user["username"]
     @target_namespace = params[:new_namespace].presence || repo_owner
-    
+
     namespace = get_or_create_namespace || (render and return)
 
     @project = Gitlab::GitlabImport::ProjectCreator.new(repo, namespace, current_user).execute
diff --git a/app/controllers/import/google_code_controller.rb b/app/controllers/import/google_code_controller.rb
index 73c912e285b..8a9ff652263 100644
--- a/app/controllers/import/google_code_controller.rb
+++ b/app/controllers/import/google_code_controller.rb
@@ -1,8 +1,8 @@
 class Import::GoogleCodeController < Import::BaseController
-  before_filter :user_map, only: [:new_user_map, :create_user_map]
+  before_action :user_map, only: [:new_user_map, :create_user_map]
 
   def new
-    
+
   end
 
   def callback
@@ -68,7 +68,7 @@ class Import::GoogleCodeController < Import::BaseController
 
   def status
     unless client.valid?
-      return redirect_to new_import_google_path 
+      return redirect_to new_import_google_path
     end
 
     @repos = client.repos
diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb
index 1f97ff16c55..a29c03395f4 100644
--- a/app/controllers/invites_controller.rb
+++ b/app/controllers/invites_controller.rb
@@ -1,6 +1,6 @@
 class InvitesController < ApplicationController
-  before_filter :member
-  skip_before_filter :authenticate_user!, only: :decline
+  before_action :member
+  skip_before_action :authenticate_user!, only: :decline
 
   respond_to :html
 
@@ -24,7 +24,7 @@ class InvitesController < ApplicationController
     if member.decline_invite!
       label, _ = source_info(member.source)
 
-      path = 
+      path =
         if current_user
           dashboard_path
         else
@@ -41,7 +41,7 @@ class InvitesController < ApplicationController
 
   def member
     return @member if defined?(@member)
-    
+
     @token = params[:id]
     @member = Member.find_by_invite_token(@token)
 
diff --git a/app/controllers/namespaces_controller.rb b/app/controllers/namespaces_controller.rb
index 386d103ee5a..83eec1bf4a2 100644
--- a/app/controllers/namespaces_controller.rb
+++ b/app/controllers/namespaces_controller.rb
@@ -1,5 +1,5 @@
 class NamespacesController < ApplicationController
-  skip_before_filter :authenticate_user!
+  skip_before_action :authenticate_user!
 
   def show
     namespace = Namespace.find_by(path: params[:id])
diff --git a/app/controllers/oauth/applications_controller.rb b/app/controllers/oauth/applications_controller.rb
index efa291d9397..ea256de2c3e 100644
--- a/app/controllers/oauth/applications_controller.rb
+++ b/app/controllers/oauth/applications_controller.rb
@@ -1,5 +1,5 @@
 class Oauth::ApplicationsController < Doorkeeper::ApplicationsController
-  before_filter :authenticate_user!
+  before_action :authenticate_user!
   layout "profile"
 
   def index
@@ -10,7 +10,7 @@ class Oauth::ApplicationsController < Doorkeeper::ApplicationsController
     @application = Doorkeeper::Application.new(application_params)
 
     @application.owner = current_user
-    
+
     if @application.save
       flash[:notice] = I18n.t(:notice, scope: [:doorkeeper, :flash, :applications, :create])
       redirect_to oauth_application_url(@application)
diff --git a/app/controllers/oauth/authorizations_controller.rb b/app/controllers/oauth/authorizations_controller.rb
index a57b4a60c24..6d3c1a320db 100644
--- a/app/controllers/oauth/authorizations_controller.rb
+++ b/app/controllers/oauth/authorizations_controller.rb
@@ -1,5 +1,5 @@
 class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
-  before_filter :authenticate_resource_owner!
+  before_action :authenticate_resource_owner!
   layout "profile"
 
   def new
diff --git a/app/controllers/profiles/keys_controller.rb b/app/controllers/profiles/keys_controller.rb
index 4e2bd0a9b4b..b0a5a631c63 100644
--- a/app/controllers/profiles/keys_controller.rb
+++ b/app/controllers/profiles/keys_controller.rb
@@ -1,6 +1,6 @@
 class Profiles::KeysController < ApplicationController
   layout "profile"
-  skip_before_filter :authenticate_user!, only: [:get_keys]
+  skip_before_action :authenticate_user!, only: [:get_keys]
 
   def index
     @keys = current_user.keys
diff --git a/app/controllers/profiles/passwords_controller.rb b/app/controllers/profiles/passwords_controller.rb
index 0c614969a3f..b719a7fe9a9 100644
--- a/app/controllers/profiles/passwords_controller.rb
+++ b/app/controllers/profiles/passwords_controller.rb
@@ -1,11 +1,11 @@
 class Profiles::PasswordsController < ApplicationController
   layout :determine_layout
 
-  skip_before_filter :check_password_expiration, only: [:new, :create]
+  skip_before_action :check_password_expiration, only: [:new, :create]
 
-  before_filter :set_user
-  before_filter :set_title
-  before_filter :authorize_change_password!
+  before_action :set_user
+  before_action :set_title
+  before_action :authorize_change_password!
 
   def new
   end
diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb
index 7f76906066d..eb001e8d739 100644
--- a/app/controllers/profiles_controller.rb
+++ b/app/controllers/profiles_controller.rb
@@ -1,9 +1,9 @@
 class ProfilesController < ApplicationController
   include ActionView::Helpers::SanitizeHelper
 
-  before_filter :user
-  before_filter :authorize_change_username!, only: :update_username
-  skip_before_filter :require_email, only: [:show, :update]
+  before_action :user
+  before_action :authorize_change_username!, only: :update_username
+  skip_before_action :require_email, only: [:show, :update]
 
   layout 'profile'
 
diff --git a/app/controllers/projects/application_controller.rb b/app/controllers/projects/application_controller.rb
index 4719933394f..f7a28e920d1 100644
--- a/app/controllers/projects/application_controller.rb
+++ b/app/controllers/projects/application_controller.rb
@@ -1,6 +1,6 @@
 class Projects::ApplicationController < ApplicationController
-  before_filter :project
-  before_filter :repository
+  before_action :project
+  before_action :repository
   layout :determine_layout
 
   def authenticate_user!
diff --git a/app/controllers/projects/avatars_controller.rb b/app/controllers/projects/avatars_controller.rb
index a482b90880d..22a12c4b9ae 100644
--- a/app/controllers/projects/avatars_controller.rb
+++ b/app/controllers/projects/avatars_controller.rb
@@ -1,7 +1,7 @@
 class Projects::AvatarsController < Projects::ApplicationController
   layout 'project'
 
-  before_filter :project
+  before_action :project
 
   def show
     @blob = @project.repository.blob_at_branch('master', @project.avatar_in_git)
diff --git a/app/controllers/projects/blame_controller.rb b/app/controllers/projects/blame_controller.rb
index a87b8270a22..3362264dcce 100644
--- a/app/controllers/projects/blame_controller.rb
+++ b/app/controllers/projects/blame_controller.rb
@@ -2,9 +2,9 @@
 class Projects::BlameController < Projects::ApplicationController
   include ExtractsPath
 
-  before_filter :require_non_empty_project
-  before_filter :assign_ref_vars
-  before_filter :authorize_download_code!
+  before_action :require_non_empty_project
+  before_action :assign_ref_vars
+  before_action :authorize_download_code!
 
   def show
     @blame = Gitlab::Git::Blame.new(@repository, @commit.id, @path)
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb
index 4b7eb4df298..b762518d377 100644
--- a/app/controllers/projects/blob_controller.rb
+++ b/app/controllers/projects/blob_controller.rb
@@ -6,15 +6,15 @@ class Projects::BlobController < Projects::ApplicationController
   # Raised when given an invalid file path
   class InvalidPathError < StandardError; end
 
-  before_filter :require_non_empty_project, except: [:new, :create]
-  before_filter :authorize_download_code!
-  before_filter :authorize_push_code!, only: [:destroy]
-  before_filter :assign_blob_vars
-  before_filter :commit, except: [:new, :create]
-  before_filter :blob, except: [:new, :create]
-  before_filter :from_merge_request, only: [:edit, :update]
-  before_filter :after_edit_path, only: [:edit, :update]
-  before_filter :require_branch_head, only: [:edit, :update]
+  before_action :require_non_empty_project, except: [:new, :create]
+  before_action :authorize_download_code!
+  before_action :authorize_push_code!, only: [:destroy]
+  before_action :assign_blob_vars
+  before_action :commit, except: [:new, :create]
+  before_action :blob, except: [:new, :create]
+  before_action :from_merge_request, only: [:edit, :update]
+  before_action :after_edit_path, only: [:edit, :update]
+  before_action :require_branch_head, only: [:edit, :update]
 
   def new
     commit unless @repository.empty?
diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb
index f049e96e61d..696011b94b9 100644
--- a/app/controllers/projects/branches_controller.rb
+++ b/app/controllers/projects/branches_controller.rb
@@ -1,9 +1,9 @@
 class Projects::BranchesController < Projects::ApplicationController
   include ActionView::Helpers::SanitizeHelper
   # Authorize
-  before_filter :require_non_empty_project
-  before_filter :authorize_download_code!
-  before_filter :authorize_push_code!, only: [:create, :destroy]
+  before_action :require_non_empty_project
+  before_action :authorize_download_code!
+  before_action :authorize_push_code!, only: [:create, :destroy]
 
   def index
     @sort = params[:sort] || 'name'
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb
index 894cf93b9ae..8a1b7899be3 100644
--- a/app/controllers/projects/commit_controller.rb
+++ b/app/controllers/projects/commit_controller.rb
@@ -3,9 +3,9 @@
 # Not to be confused with CommitsController, plural.
 class Projects::CommitController < Projects::ApplicationController
   # Authorize
-  before_filter :require_non_empty_project
-  before_filter :authorize_download_code!
-  before_filter :commit
+  before_action :require_non_empty_project
+  before_action :authorize_download_code!
+  before_action :commit
 
   def show
     return git_not_found! unless @commit
diff --git a/app/controllers/projects/commits_controller.rb b/app/controllers/projects/commits_controller.rb
index 4b6ab437476..d1c15174aea 100644
--- a/app/controllers/projects/commits_controller.rb
+++ b/app/controllers/projects/commits_controller.rb
@@ -3,9 +3,9 @@ require "base64"
 class Projects::CommitsController < Projects::ApplicationController
   include ExtractsPath
 
-  before_filter :require_non_empty_project
-  before_filter :assign_ref_vars
-  before_filter :authorize_download_code!
+  before_action :require_non_empty_project
+  before_action :assign_ref_vars
+  before_action :authorize_download_code!
 
   def show
     @repo = @project.repository
diff --git a/app/controllers/projects/compare_controller.rb b/app/controllers/projects/compare_controller.rb
index 146808fa562..03e6c381275 100644
--- a/app/controllers/projects/compare_controller.rb
+++ b/app/controllers/projects/compare_controller.rb
@@ -1,7 +1,7 @@
 class Projects::CompareController < Projects::ApplicationController
   # Authorize
-  before_filter :require_non_empty_project
-  before_filter :authorize_download_code!
+  before_action :require_non_empty_project
+  before_action :authorize_download_code!
 
   def index
   end
diff --git a/app/controllers/projects/deploy_keys_controller.rb b/app/controllers/projects/deploy_keys_controller.rb
index 6fba3ce299b..8c1bbf76917 100644
--- a/app/controllers/projects/deploy_keys_controller.rb
+++ b/app/controllers/projects/deploy_keys_controller.rb
@@ -2,7 +2,7 @@ class Projects::DeployKeysController < Projects::ApplicationController
   respond_to :html
 
   # Authorize
-  before_filter :authorize_admin_project!
+  before_action :authorize_admin_project!
 
   layout "project_settings"
 
diff --git a/app/controllers/projects/forks_controller.rb b/app/controllers/projects/forks_controller.rb
index 21a151a426e..01a079d2e65 100644
--- a/app/controllers/projects/forks_controller.rb
+++ b/app/controllers/projects/forks_controller.rb
@@ -1,7 +1,7 @@
 class Projects::ForksController < Projects::ApplicationController
   # Authorize
-  before_filter :require_non_empty_project
-  before_filter :authorize_download_code!
+  before_action :require_non_empty_project
+  before_action :authorize_download_code!
 
   def new
     @namespaces = current_user.manageable_namespaces
diff --git a/app/controllers/projects/graphs_controller.rb b/app/controllers/projects/graphs_controller.rb
index 6e54af356e0..a060ea6f998 100644
--- a/app/controllers/projects/graphs_controller.rb
+++ b/app/controllers/projects/graphs_controller.rb
@@ -1,7 +1,7 @@
 class Projects::GraphsController < Projects::ApplicationController
   # Authorize
-  before_filter :require_non_empty_project
-  before_filter :authorize_download_code!
+  before_action :require_non_empty_project
+  before_action :authorize_download_code!
 
   def show
     respond_to do |format|
diff --git a/app/controllers/projects/hooks_controller.rb b/app/controllers/projects/hooks_controller.rb
index ba95bb13e1f..57fc48ac7da 100644
--- a/app/controllers/projects/hooks_controller.rb
+++ b/app/controllers/projects/hooks_controller.rb
@@ -1,6 +1,6 @@
 class Projects::HooksController < Projects::ApplicationController
   # Authorize
-  before_filter :authorize_admin_project!
+  before_action :authorize_admin_project!
 
   respond_to :html
 
diff --git a/app/controllers/projects/imports_controller.rb b/app/controllers/projects/imports_controller.rb
index b64491b4666..066b66014f8 100644
--- a/app/controllers/projects/imports_controller.rb
+++ b/app/controllers/projects/imports_controller.rb
@@ -1,8 +1,8 @@
 class Projects::ImportsController < Projects::ApplicationController
   # Authorize
-  before_filter :authorize_admin_project!
-  before_filter :require_no_repo
-  before_filter :redirect_if_progress, except: :show
+  before_action :authorize_admin_project!
+  before_action :require_no_repo
+  before_action :redirect_if_progress, except: :show
 
   def new
   end
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 88302276b5e..c524e1a0ea3 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -1,18 +1,18 @@
 class Projects::IssuesController < Projects::ApplicationController
-  before_filter :module_enabled
-  before_filter :issue, only: [:edit, :update, :show, :toggle_subscription]
+  before_action :module_enabled
+  before_action :issue, only: [:edit, :update, :show, :toggle_subscription]
 
   # Allow read any issue
-  before_filter :authorize_read_issue!
+  before_action :authorize_read_issue!
 
   # Allow write(create) issue
-  before_filter :authorize_write_issue!, only: [:new, :create]
+  before_action :authorize_write_issue!, only: [:new, :create]
 
   # Allow modify issue
-  before_filter :authorize_modify_issue!, only: [:edit, :update]
+  before_action :authorize_modify_issue!, only: [:edit, :update]
 
   # Allow issues bulk update
-  before_filter :authorize_admin_issues!, only: [:bulk_update]
+  before_action :authorize_admin_issues!, only: [:bulk_update]
 
   respond_to :html
 
@@ -99,7 +99,7 @@ class Projects::IssuesController < Projects::ApplicationController
 
   def toggle_subscription
     @issue.toggle_subscription(current_user)
-    
+
     render nothing: true
   end
 
diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb
index 207a01ed3b0..2f8cb203cf9 100644
--- a/app/controllers/projects/labels_controller.rb
+++ b/app/controllers/projects/labels_controller.rb
@@ -1,8 +1,8 @@
 class Projects::LabelsController < Projects::ApplicationController
-  before_filter :module_enabled
-  before_filter :label, only: [:edit, :update, :destroy]
-  before_filter :authorize_labels!
-  before_filter :authorize_admin_labels!, except: [:index]
+  before_action :module_enabled
+  before_action :label, only: [:edit, :update, :destroy]
+  before_action :authorize_labels!
+  before_action :authorize_admin_labels!, except: [:index]
 
   respond_to :js, :html
 
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 47ce8467358..ab75f2ddb73 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -1,20 +1,20 @@
 require 'gitlab/satellite/satellite'
 
 class Projects::MergeRequestsController < Projects::ApplicationController
-  before_filter :module_enabled
-  before_filter :merge_request, only: [:edit, :update, :show, :diffs, :automerge, :automerge_check, :ci_status, :toggle_subscription]
-  before_filter :closes_issues, only: [:edit, :update, :show, :diffs]
-  before_filter :validates_merge_request, only: [:show, :diffs]
-  before_filter :define_show_vars, only: [:show, :diffs]
+  before_action :module_enabled
+  before_action :merge_request, only: [:edit, :update, :show, :diffs, :automerge, :automerge_check, :ci_status, :toggle_subscription]
+  before_action :closes_issues, only: [:edit, :update, :show, :diffs]
+  before_action :validates_merge_request, only: [:show, :diffs]
+  before_action :define_show_vars, only: [:show, :diffs]
 
   # Allow read any merge_request
-  before_filter :authorize_read_merge_request!
+  before_action :authorize_read_merge_request!
 
   # Allow write(create) merge_request
-  before_filter :authorize_write_merge_request!, only: [:new, :create]
+  before_action :authorize_write_merge_request!, only: [:new, :create]
 
   # Allow modify merge_request
-  before_filter :authorize_modify_merge_request!, only: [:close, :edit, :update, :sort]
+  before_action :authorize_modify_merge_request!, only: [:close, :edit, :update, :sort]
 
   def index
     terms = params['issue_search']
@@ -176,7 +176,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
 
   def toggle_subscription
     @merge_request.toggle_subscription(current_user)
-    
+
     render nothing: true
   end
 
diff --git a/app/controllers/projects/milestones_controller.rb b/app/controllers/projects/milestones_controller.rb
index b49b549547a..61689488d13 100644
--- a/app/controllers/projects/milestones_controller.rb
+++ b/app/controllers/projects/milestones_controller.rb
@@ -1,12 +1,12 @@
 class Projects::MilestonesController < Projects::ApplicationController
-  before_filter :module_enabled
-  before_filter :milestone, only: [:edit, :update, :destroy, :show, :sort_issues, :sort_merge_requests]
+  before_action :module_enabled
+  before_action :milestone, only: [:edit, :update, :destroy, :show, :sort_issues, :sort_merge_requests]
 
   # Allow read any milestone
-  before_filter :authorize_read_milestone!
+  before_action :authorize_read_milestone!
 
   # Allow admin milestone
-  before_filter :authorize_admin_milestone!, except: [:index, :show]
+  before_action :authorize_admin_milestone!, except: [:index, :show]
 
   respond_to :html
 
diff --git a/app/controllers/projects/network_controller.rb b/app/controllers/projects/network_controller.rb
index 83d1c1dacae..06aef91cadd 100644
--- a/app/controllers/projects/network_controller.rb
+++ b/app/controllers/projects/network_controller.rb
@@ -2,9 +2,9 @@ class Projects::NetworkController < Projects::ApplicationController
   include ExtractsPath
   include ApplicationHelper
 
-  before_filter :require_non_empty_project
-  before_filter :assign_ref_vars
-  before_filter :authorize_download_code!
+  before_action :require_non_empty_project
+  before_action :assign_ref_vars
+  before_action :authorize_download_code!
 
   def show
     respond_to do |format|
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb
index 868629a0bc4..496b85cb46d 100644
--- a/app/controllers/projects/notes_controller.rb
+++ b/app/controllers/projects/notes_controller.rb
@@ -1,9 +1,9 @@
 class Projects::NotesController < Projects::ApplicationController
   # Authorize
-  before_filter :authorize_read_note!
-  before_filter :authorize_write_note!, only: [:create]
-  before_filter :authorize_admin_note!, only: [:update, :destroy]
-  before_filter :find_current_user_notes, except: [:destroy, :delete_attachment]
+  before_action :authorize_read_note!
+  before_action :authorize_write_note!, only: [:create]
+  before_action :authorize_admin_note!, only: [:update, :destroy]
+  before_action :find_current_user_notes, except: [:destroy, :delete_attachment]
 
   def index
     current_fetched_at = Time.now.to_i
diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb
index 72967a26ff1..d7fbc979067 100644
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -1,6 +1,6 @@
 class Projects::ProjectMembersController < Projects::ApplicationController
   # Authorize
-  before_filter :authorize_admin_project!, except: :leave
+  before_action :authorize_admin_project!, except: :leave
 
   layout "project_settings"
 
@@ -24,7 +24,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
         users = @group.users.search(params[:search]).to_a
         @group_members = @group_members.where(user_id: users)
       end
-      
+
       @group_members = @group_members.order('access_level DESC').limit(20)
     end
 
@@ -62,7 +62,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
     redirect_path = namespace_project_project_members_path(@project.namespace, @project)
 
     @project_member = @project.project_members.find(params[:id])
-    
+
     if @project_member.invite?
       @project_member.resend_invite
 
diff --git a/app/controllers/projects/protected_branches_controller.rb b/app/controllers/projects/protected_branches_controller.rb
index ac36ac6fcd3..6b52eccebf7 100644
--- a/app/controllers/projects/protected_branches_controller.rb
+++ b/app/controllers/projects/protected_branches_controller.rb
@@ -1,7 +1,7 @@
 class Projects::ProtectedBranchesController < Projects::ApplicationController
   # Authorize
-  before_filter :require_non_empty_project
-  before_filter :authorize_admin_project!
+  before_action :require_non_empty_project
+  before_action :authorize_admin_project!
 
   layout "project_settings"
 
diff --git a/app/controllers/projects/raw_controller.rb b/app/controllers/projects/raw_controller.rb
index b1a029ce696..647c1454078 100644
--- a/app/controllers/projects/raw_controller.rb
+++ b/app/controllers/projects/raw_controller.rb
@@ -2,9 +2,9 @@
 class Projects::RawController < Projects::ApplicationController
   include ExtractsPath
 
-  before_filter :require_non_empty_project
-  before_filter :assign_ref_vars
-  before_filter :authorize_download_code!
+  before_action :require_non_empty_project
+  before_action :assign_ref_vars
+  before_action :authorize_download_code!
 
   def show
     @blob = @repository.blob_at(@commit.id, @path)
diff --git a/app/controllers/projects/refs_controller.rb b/app/controllers/projects/refs_controller.rb
index ec3b2b8d75a..01ca1537c0e 100644
--- a/app/controllers/projects/refs_controller.rb
+++ b/app/controllers/projects/refs_controller.rb
@@ -1,9 +1,9 @@
 class Projects::RefsController < Projects::ApplicationController
   include ExtractsPath
 
-  before_filter :require_non_empty_project
-  before_filter :assign_ref_vars
-  before_filter :authorize_download_code!
+  before_action :require_non_empty_project
+  before_action :assign_ref_vars
+  before_action :authorize_download_code!
 
   def switch
     respond_to do |format|
diff --git a/app/controllers/projects/repositories_controller.rb b/app/controllers/projects/repositories_controller.rb
index 96defb0c721..c4a5e2d6359 100644
--- a/app/controllers/projects/repositories_controller.rb
+++ b/app/controllers/projects/repositories_controller.rb
@@ -1,8 +1,8 @@
 class Projects::RepositoriesController < Projects::ApplicationController
   # Authorize
-  before_filter :require_non_empty_project, except: :create
-  before_filter :authorize_download_code!
-  before_filter :authorize_admin_project!, only: :create
+  before_action :require_non_empty_project, except: :create
+  before_action :authorize_download_code!
+  before_action :authorize_admin_project!, only: :create
 
   def create
     @project.create_repository
diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb
index 9a484c109ba..ae8146dca59 100644
--- a/app/controllers/projects/services_controller.rb
+++ b/app/controllers/projects/services_controller.rb
@@ -1,7 +1,7 @@
 class Projects::ServicesController < Projects::ApplicationController
   # Authorize
-  before_filter :authorize_admin_project!
-  before_filter :service, only: [:edit, :update, :test]
+  before_action :authorize_admin_project!
+  before_action :service, only: [:edit, :update, :test]
 
   respond_to :html
 
diff --git a/app/controllers/projects/snippets_controller.rb b/app/controllers/projects/snippets_controller.rb
index ed268400373..3d75abcc29d 100644
--- a/app/controllers/projects/snippets_controller.rb
+++ b/app/controllers/projects/snippets_controller.rb
@@ -1,18 +1,18 @@
 class Projects::SnippetsController < Projects::ApplicationController
-  before_filter :module_enabled
-  before_filter :snippet, only: [:show, :edit, :destroy, :update, :raw]
+  before_action :module_enabled
+  before_action :snippet, only: [:show, :edit, :destroy, :update, :raw]
 
   # Allow read any snippet
-  before_filter :authorize_read_project_snippet!
+  before_action :authorize_read_project_snippet!
 
   # Allow write(create) snippet
-  before_filter :authorize_write_project_snippet!, only: [:new, :create]
+  before_action :authorize_write_project_snippet!, only: [:new, :create]
 
   # Allow modify snippet
-  before_filter :authorize_modify_project_snippet!, only: [:edit, :update]
+  before_action :authorize_modify_project_snippet!, only: [:edit, :update]
 
   # Allow destroy snippet
-  before_filter :authorize_admin_project_snippet!, only: [:destroy]
+  before_action :authorize_admin_project_snippet!, only: [:destroy]
 
   respond_to :html
 
diff --git a/app/controllers/projects/tags_controller.rb b/app/controllers/projects/tags_controller.rb
index 83f4937bce3..f565fbbbbc3 100644
--- a/app/controllers/projects/tags_controller.rb
+++ b/app/controllers/projects/tags_controller.rb
@@ -1,9 +1,9 @@
 class Projects::TagsController < Projects::ApplicationController
   # Authorize
-  before_filter :require_non_empty_project
-  before_filter :authorize_download_code!
-  before_filter :authorize_push_code!, only: [:create]
-  before_filter :authorize_admin_project!, only: [:destroy]
+  before_action :require_non_empty_project
+  before_action :authorize_download_code!
+  before_action :authorize_push_code!, only: [:create]
+  before_action :authorize_admin_project!, only: [:destroy]
 
   def index
     sorted = VersionSorter.rsort(@repository.tag_names)
diff --git a/app/controllers/projects/tree_controller.rb b/app/controllers/projects/tree_controller.rb
index b23010bf595..b659e15f242 100644
--- a/app/controllers/projects/tree_controller.rb
+++ b/app/controllers/projects/tree_controller.rb
@@ -2,9 +2,9 @@
 class Projects::TreeController < Projects::ApplicationController
   include ExtractsPath
 
-  before_filter :require_non_empty_project, except: [:new, :create]
-  before_filter :assign_ref_vars
-  before_filter :authorize_download_code!
+  before_action :require_non_empty_project, except: [:new, :create]
+  before_action :assign_ref_vars
+  before_action :authorize_download_code!
 
   def show
     if tree.entries.empty?
diff --git a/app/controllers/projects/uploads_controller.rb b/app/controllers/projects/uploads_controller.rb
index 276dced8656..6153ca2dc1b 100644
--- a/app/controllers/projects/uploads_controller.rb
+++ b/app/controllers/projects/uploads_controller.rb
@@ -1,11 +1,11 @@
 class Projects::UploadsController < Projects::ApplicationController
   layout 'project'
 
-  # We want to skip these filters for only the `show` action if `image?` is true, 
+  # We want to skip these filters for only the `show` action if `image?` is true,
   # but `skip_before_filter` doesn't work with both `only` and `if`, so we accomplish the same like this.
   skipped_filters = [:authenticate_user!, :reject_blocked!, :project, :repository]
-  skip_before_filter  *skipped_filters, only: [:show]
-  before_filter       *skipped_filters, only: [:show], unless: :image?
+  skip_before_action  *skipped_filters, only: [:show]
+  before_action       *skipped_filters, only: [:show], unless: :image?
 
   def create
     link_to_file = ::Projects::UploadService.new(project, params[:file]).
@@ -40,7 +40,7 @@ class Projects::UploadsController < Projects::ApplicationController
     file_project = Project.find_with_namespace("#{namespace}/#{id}")
 
     if file_project.nil?
-      @uploader = nil 
+      @uploader = nil
       return
     end
 
diff --git a/app/controllers/projects/wikis_controller.rb b/app/controllers/projects/wikis_controller.rb
index aeb7f0699f5..36ef86e1909 100644
--- a/app/controllers/projects/wikis_controller.rb
+++ b/app/controllers/projects/wikis_controller.rb
@@ -1,10 +1,10 @@
 require 'project_wiki'
 
 class Projects::WikisController < Projects::ApplicationController
-  before_filter :authorize_read_wiki!
-  before_filter :authorize_write_wiki!, only: [:edit, :create, :history]
-  before_filter :authorize_admin_wiki!, only: :destroy
-  before_filter :load_project_wiki
+  before_action :authorize_read_wiki!
+  before_action :authorize_write_wiki!, only: [:edit, :create, :history]
+  before_action :authorize_admin_wiki!, only: :destroy
+  before_action :load_project_wiki
   include WikiHelper
 
   def pages
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 0f28794b736..1422f2b8a4c 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -1,13 +1,13 @@
 class ProjectsController < ApplicationController
   prepend_before_filter :render_go_import, only: [:show]
-  skip_before_filter :authenticate_user!, only: [:show]
-  before_filter :project, except: [:new, :create]
-  before_filter :repository, except: [:new, :create]
+  skip_before_action :authenticate_user!, only: [:show]
+  before_action :project, except: [:new, :create]
+  before_action :repository, except: [:new, :create]
 
   # Authorize
-  before_filter :authorize_admin_project!, only: [:edit, :update, :destroy, :transfer, :archive, :unarchive]
-  before_filter :set_title, only: [:new, :create]
-  before_filter :event_filter, only: :show
+  before_action :authorize_admin_project!, only: [:edit, :update, :destroy, :transfer, :archive, :unarchive]
+  before_action :set_title, only: [:new, :create]
+  before_action :event_filter, only: :show
 
   layout 'navless', only: [:new, :create, :fork]
 
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 38d116a4ee3..830751a989f 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -1,5 +1,5 @@
 class RegistrationsController < Devise::RegistrationsController
-  before_filter :signup_enabled?
+  before_action :signup_enabled?
 
   def new
     redirect_to(new_user_session_path)
diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb
index cd52556b203..1eff3dd29de 100644
--- a/app/controllers/snippets_controller.rb
+++ b/app/controllers/snippets_controller.rb
@@ -1,15 +1,15 @@
 class SnippetsController < ApplicationController
-  before_filter :snippet, only: [:show, :edit, :destroy, :update, :raw]
+  before_action :snippet, only: [:show, :edit, :destroy, :update, :raw]
 
   # Allow modify snippet
-  before_filter :authorize_modify_snippet!, only: [:edit, :update]
+  before_action :authorize_modify_snippet!, only: [:edit, :update]
 
   # Allow destroy snippet
-  before_filter :authorize_admin_snippet!, only: [:destroy]
+  before_action :authorize_admin_snippet!, only: [:destroy]
 
-  before_filter :set_title
+  before_action :set_title
 
-  skip_before_filter :authenticate_user!, only: [:index, :user_index, :show, :raw]
+  skip_before_action :authenticate_user!, only: [:index, :user_index, :show, :raw]
 
   respond_to :html
 
diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index c5f3da54ea2..17edff68be2 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -1,6 +1,6 @@
 class UploadsController < ApplicationController
-  skip_before_filter :authenticate_user!
-  before_filter :find_model, :authorize_access!
+  skip_before_action :authenticate_user!
+  before_action :find_model, :authorize_access!
 
   def show
     uploader = @model.send(upload_mount)
@@ -28,7 +28,7 @@ class UploadsController < ApplicationController
   end
 
   def authorize_access!
-    authorized = 
+    authorized =
       case @model
       when Project
         can?(current_user, :read_project, @model)
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 679d6897ce9..460cc868b35 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,6 +1,6 @@
 class UsersController < ApplicationController
-  skip_before_filter :authenticate_user!
-  before_filter :set_user
+  skip_before_action :authenticate_user!
+  before_action :set_user
   layout :determine_layout
 
   def show
diff --git a/db/schema.rb b/db/schema.rb
index 1aee37b2e61..2b7e27e3a31 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -470,7 +470,6 @@ ActiveRecord::Schema.define(version: 20150417122318) do
     t.integer  "notification_level",            default: 1,     null: false
     t.datetime "password_expires_at"
     t.integer  "created_by_id"
-    t.datetime "last_credential_check_at"
     t.string   "avatar"
     t.string   "confirmation_token"
     t.datetime "confirmed_at"
@@ -478,6 +477,7 @@ ActiveRecord::Schema.define(version: 20150417122318) do
     t.string   "unconfirmed_email"
     t.boolean  "hide_no_ssh_key",               default: false
     t.string   "website_url",                   default: "",    null: false
+    t.datetime "last_credential_check_at"
     t.string   "github_access_token"
     t.string   "gitlab_access_token"
     t.string   "notification_email"

From 5bbe2860bf3f9e24d2f658aa2a32baabbe997cea Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Mon, 20 Apr 2015 18:48:53 +0200
Subject: [PATCH 17/80] Update gitlab-grack to 2.0.1 to get unicorn to stop
 creating zombies.

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1c2a9002204..3522937f18e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -42,7 +42,7 @@ gem "browser"
 gem "gitlab_git", '~> 7.1.10'
 
 # Ruby/Rack Git Smart-HTTP Server Handler
-gem 'gitlab-grack', '~> 2.0.0.rc2', require: 'grack'
+gem 'gitlab-grack', '~> 2.0.1', require: 'grack'
 
 # LDAP Auth
 gem 'gitlab_omniauth-ldap', '1.2.1', require: "omniauth-ldap"
diff --git a/Gemfile.lock b/Gemfile.lock
index 360b1abcf56..fbf0ef443a1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -199,7 +199,7 @@ GEM
     gitlab-flowdock-git-hook (0.4.2.2)
       gitlab-grit (>= 2.4.1)
       multi_json
-    gitlab-grack (2.0.0)
+    gitlab-grack (2.0.1)
       rack (~> 1.5.1)
     gitlab-grit (2.7.2)
       charlock_holmes (~> 0.6)
@@ -700,7 +700,7 @@ DEPENDENCIES
   gemnasium-gitlab-service (~> 0.2)
   github-markup
   gitlab-flowdock-git-hook (~> 0.4.2)
-  gitlab-grack (~> 2.0.0.rc2)
+  gitlab-grack (~> 2.0.1)
   gitlab-linguist (~> 3.0.1)
   gitlab_emoji (~> 0.1)
   gitlab_git (~> 7.1.10)

From 96c2b940480eb1bafd47e1f6d203ad11f8f646df Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Thu, 2 Apr 2015 20:46:43 -0400
Subject: [PATCH 18/80] Reference filters :sparkles:

Commit ranges, commits, external issues, issues, labels, merge requests,
snippets, users.
---
 app/helpers/issues_helper.rb                  |   2 +
 app/helpers/labels_helper.rb                  |  16 +-
 lib/gitlab/markdown.rb                        | 328 +++---------------
 .../markdown/commit_range_reference_filter.rb | 127 +++++++
 .../markdown/commit_reference_filter.rb       | 108 ++++++
 .../markdown/cross_project_reference.rb       |  26 ++
 .../external_issue_reference_filter.rb        |  94 +++++
 lib/gitlab/markdown/issue_reference_filter.rb | 110 ++++++
 lib/gitlab/markdown/label_reference_filter.rb | 100 ++++++
 .../merge_request_reference_filter.rb         | 107 ++++++
 .../markdown/snippet_reference_filter.rb      |  98 ++++++
 lib/gitlab/markdown/user_reference_filter.rb  | 117 +++++++
 spec/helpers/gitlab_markdown_helper_spec.rb   |  52 +--
 spec/helpers/labels_helper_spec.rb            |   4 +-
 .../commit_range_reference_filter_spec.rb     | 105 ++++++
 .../markdown/commit_reference_filter_spec.rb  |  98 ++++++
 .../markdown/cross_project_reference_spec.rb  |  23 ++
 .../external_issue_reference_filter_spec.rb   | 101 ++++++
 .../markdown/issue_reference_filter_spec.rb   | 104 ++++++
 .../markdown/label_reference_filter_spec.rb   |  72 ++++
 .../merge_request_reference_filter_spec.rb    |  93 +++++
 .../markdown/snippet_reference_filter_spec.rb |  64 ++++
 .../markdown/user_reference_filter_spec.rb    |  87 +++++
 spec/support/reference_filter_spec_helper.rb  |  37 ++
 24 files changed, 1730 insertions(+), 343 deletions(-)
 create mode 100644 lib/gitlab/markdown/commit_range_reference_filter.rb
 create mode 100644 lib/gitlab/markdown/commit_reference_filter.rb
 create mode 100644 lib/gitlab/markdown/cross_project_reference.rb
 create mode 100644 lib/gitlab/markdown/external_issue_reference_filter.rb
 create mode 100644 lib/gitlab/markdown/issue_reference_filter.rb
 create mode 100644 lib/gitlab/markdown/label_reference_filter.rb
 create mode 100644 lib/gitlab/markdown/merge_request_reference_filter.rb
 create mode 100644 lib/gitlab/markdown/snippet_reference_filter.rb
 create mode 100644 lib/gitlab/markdown/user_reference_filter.rb
 create mode 100644 spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
 create mode 100644 spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
 create mode 100644 spec/lib/gitlab/markdown/cross_project_reference_spec.rb
 create mode 100644 spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb
 create mode 100644 spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
 create mode 100644 spec/lib/gitlab/markdown/label_reference_filter_spec.rb
 create mode 100644 spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb
 create mode 100644 spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
 create mode 100644 spec/lib/gitlab/markdown/user_reference_filter_spec.rb
 create mode 100644 spec/support/reference_filter_spec_helper.rb

diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index ad4a7612724..7b034f22248 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -108,4 +108,6 @@ module IssuesHelper
       xml.summary issue.title
     end
   end
+
+  module_function :url_for_issue, :title_for_issue
 end
diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
index 32ef2e7ca84..0259829a059 100644
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -7,9 +7,13 @@ module LabelsHelper
     label_color = label.color || Label::DEFAULT_COLOR
     text_color = text_color_for_bg(label_color)
 
-    content_tag :span, class: 'label color-label', style: "background-color:#{label_color};color:#{text_color}" do
-      label.name
-    end
+    # Intentionally not using content_tag here so that this method can be called
+    # by LabelReferenceFilter
+    span = %(<span class="label color-label") +
+      %( style="background-color: #{label_color}; color: #{text_color}">) +
+      label.name + '</span>'
+
+    span.html_safe
   end
 
   def suggested_colors
@@ -42,13 +46,15 @@ module LabelsHelper
     r, g, b = bg_color.slice(1,7).scan(/.{2}/).map(&:hex)
 
     if (r + g + b) > 500
-      "#333"
+      '#333333'
     else
-      "#FFF"
+      '#FFFFFF'
     end
   end
 
   def project_labels_options(project)
     options_from_collection_for_select(project.labels, 'name', 'name', params[:label_name])
   end
+
+  module_function :render_colored_label, :text_color_for_bg
 end
diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb
index 47c456d8dc7..93c279edc32 100644
--- a/lib/gitlab/markdown.rb
+++ b/lib/gitlab/markdown.rb
@@ -10,11 +10,11 @@ module Gitlab
   # Supported reference formats are:
   #   * @foo for team members
   #   * #123 for issues
-  #   * #JIRA-123 for Jira issues
+  #   * JIRA-123 for Jira issues
   #   * !123 for merge requests
   #   * $123 for snippets
-  #   * 123456 for commits
-  #   * 123456...7890123 for commit ranges (comparisons)
+  #   * 1c002d for specific commit
+  #   * 1c002d...35cfb2 for commit ranges (comparisons)
   #
   # It also parses Emoji codes to insert images. See
   # http://www.emoji-cheat-sheet.com/ for a list of the supported icons.
@@ -30,10 +30,6 @@ module Gitlab
   #   >> gfm(":trollface:")
   #   => "<img alt=\":trollface:\" class=\"emoji\" src=\"/images/trollface.png" title=\":trollface:\" />
   module Markdown
-    include IssuesHelper
-
-    attr_reader :options, :html_options
-
     # Public: Parse the provided text with GitLab-Flavored Markdown
     #
     # text         - the source text
@@ -65,42 +61,13 @@ module Gitlab
         reference_only_path:  true
       )
 
-      @options      = options
-      @html_options = html_options
-
-      # TODO: add popups with additional information
-
-      # Used markdown pipelines in GitLab:
-      # GitlabEmojiFilter - performs emoji replacement.
-      # SanitizationFilter - remove unsafe HTML tags and attributes
-      #
-      # see https://gitlab.com/gitlab-org/html-pipeline-gitlab for more filters
-      filters = [
-        HTML::Pipeline::Gitlab::GitlabEmojiFilter,
-        HTML::Pipeline::SanitizationFilter
-      ]
-
-      whitelist = HTML::Pipeline::SanitizationFilter::WHITELIST
-      whitelist[:attributes][:all].push('class', 'id')
-      whitelist[:elements].push('span')
-
-      # Remove the rel attribute that the sanitize gem adds, and remove the
-      # href attribute if it contains inline javascript
-      fix_anchors = lambda do |env|
-        name, node = env[:node_name], env[:node]
-        if name == 'a'
-          node.remove_attribute('rel')
-          if node['href'] && node['href'].match('javascript:')
-            node.remove_attribute('href')
-          end
-        end
-      end
-      whitelist[:transformers].push(fix_anchors)
-
       markdown_context = {
-              asset_root: Gitlab.config.gitlab.url,
-              asset_host: Gitlab::Application.config.asset_host,
-              whitelist: whitelist
+        asset_root:      Gitlab.config.gitlab.url,
+        asset_host:      Gitlab::Application.config.asset_host,
+        whitelist:       sanitization_whitelist,
+        reference_class: html_options[:class],
+        only_path:       options[:reference_only_path],
+        project:         project
       }
 
       markdown_pipeline = HTML::Pipeline::Gitlab.new(filters).pipeline
@@ -114,21 +81,6 @@ module Gitlab
 
       text = result[:output].to_html(save_with: save_options)
 
-      # Extract pre blocks so they are not altered
-      # from http://github.github.com/github-flavored-markdown/
-      text.gsub!(%r{<pre>.*?</pre>|<code>.*?</code>}m) { |match| extract_piece(match) }
-      # Extract links with probably parsable hrefs
-      text.gsub!(%r{<a.*?>.*?</a>}m) { |match| extract_piece(match) }
-      # Extract images with probably parsable src
-      text.gsub!(%r{<img.*?>}m) { |match| extract_piece(match) }
-
-      text = parse(text, project)
-
-      # Insert pre block extractions
-      text.gsub!(/\{gfm-extraction-(\h{32})\}/) do
-        insert_piece($1)
-      end
-
       if options[:parse_tasks]
         text = parse_tasks(text)
       end
@@ -138,242 +90,48 @@ module Gitlab
 
     private
 
-    def extract_piece(text)
-      @extractions ||= {}
-
-      md5 = Digest::MD5.hexdigest(text)
-      @extractions[md5] = text
-      "{gfm-extraction-#{md5}}"
-    end
-
-    def insert_piece(id)
-      @extractions[id]
-    end
-
-    # Private: Parses text for references
+    # Custom filters for html-pipeline:
     #
-    # text - Text to parse
+    # See https://gitlab.com/gitlab-org/html-pipeline-gitlab for more filters
+    def filters
+      [
+        Gitlab::Markdown::UserReferenceFilter,
+        Gitlab::Markdown::IssueReferenceFilter,
+        Gitlab::Markdown::ExternalIssueReferenceFilter,
+        Gitlab::Markdown::MergeRequestReferenceFilter,
+        Gitlab::Markdown::SnippetReferenceFilter,
+        Gitlab::Markdown::CommitRangeReferenceFilter,
+        Gitlab::Markdown::CommitReferenceFilter,
+        Gitlab::Markdown::LabelReferenceFilter,
+        HTML::Pipeline::Gitlab::GitlabEmojiFilter,
+        HTML::Pipeline::SanitizationFilter
+      ]
+    end
+
+    # Customize the SanitizationFilter whitelist
     #
-    # Returns parsed text
-    def parse(text, project = @project)
-      parse_references(text, project) if project
+    # - Allow `class` and `id` attributes on all elements
+    # - Allow `span` elements
+    # - Remove `rel` attributes from `a` elements
+    # - Remove `a` nodes with `javascript:` in the `href` attribute
+    def sanitization_whitelist
+      whitelist = HTML::Pipeline::SanitizationFilter::WHITELIST
+      whitelist[:attributes][:all].push('class', 'id')
+      whitelist[:elements].push('span')
 
-      text
-    end
-
-    NAME_STR = Gitlab::Regex::NAMESPACE_REGEX_STR
-    PROJ_STR = "(?<project>#{NAME_STR}/#{NAME_STR})"
-
-    REFERENCE_PATTERN = %r{
-      (?<prefix>\W)?                         # Prefix
-      (                                      # Reference
-         @(?<user>#{NAME_STR})               # User name
-        |~(?<label>\d+)                      # Label ID
-        |(?<issue>([A-Z\-]+-)\d+)            # JIRA Issue ID
-        |#{PROJ_STR}?\#(?<issue>([a-zA-Z\-]+-)?\d+) # Issue ID
-        |#{PROJ_STR}?!(?<merge_request>\d+)  # MR ID
-        |\$(?<snippet>\d+)                   # Snippet ID
-        |(#{PROJ_STR}@)?(?<commit_range>[\h]{6,40}\.{2,3}[\h]{6,40}) # Commit range
-        |(#{PROJ_STR}@)?(?<commit>[\h]{6,40}) # Commit ID
-        |(?<skip>gfm-extraction-[\h]{6,40})  # Skip gfm extractions. Otherwise will be parsed as commit
-      )
-      (?<suffix>\W)?                         # Suffix
-    }x.freeze
-
-    TYPES = [:user, :issue, :label, :merge_request, :snippet, :commit, :commit_range].freeze
-
-    def parse_references(text, project = @project)
-      # parse reference links
-      text.gsub!(REFERENCE_PATTERN) do |match|
-        type       = TYPES.select{|t| !$~[t].nil?}.first
-
-        actual_project = project
-        project_prefix = nil
-        project_path = $LAST_MATCH_INFO[:project]
-        if project_path
-          actual_project = ::Project.find_with_namespace(project_path)
-          actual_project = nil unless can?(current_user, :read_project, actual_project)
-          project_prefix = project_path
-        end
-
-        parse_result($LAST_MATCH_INFO, type,
-                     actual_project, project_prefix) || match
-      end
-    end
-
-    # Called from #parse_references.  Attempts to build a gitlab reference
-    # link.  Returns nil if +type+ is nil, if the match string is an HTML
-    # entity, if the reference is invalid, or if the matched text includes an
-    # invalid project path.
-    def parse_result(match_info, type, project, project_prefix)
-      prefix = match_info[:prefix]
-      suffix = match_info[:suffix]
-
-      return nil if html_entity?(prefix, suffix) || type.nil?
-      return nil if project.nil? && !project_prefix.nil?
-
-      identifier = match_info[type]
-      ref_link = reference_link(type, identifier, project, project_prefix)
-
-      if ref_link
-        "#{prefix}#{ref_link}#{suffix}"
-      else
-        nil
-      end
-    end
-
-    # Return true if the +prefix+ and +suffix+ indicate that the matched string
-    # is an HTML entity like &amp;
-    def html_entity?(prefix, suffix)
-      prefix && suffix && prefix[0] == '&' && suffix[-1] == ';'
-    end
-
-    # Private: Dispatches to a dedicated processing method based on reference
-    #
-    # reference  - Object reference ("@1234", "!567", etc.)
-    # identifier - Object identifier (Issue ID, SHA hash, etc.)
-    #
-    # Returns string rendered by the processing method
-    def reference_link(type, identifier, project = @project, prefix_text = nil)
-      send("reference_#{type}", identifier, project, prefix_text)
-    end
-
-    def reference_user(identifier, project = @project, _ = nil)
-      link_options = html_options.merge(
-          class: "gfm gfm-project_member #{html_options[:class]}"
-        )
-
-      if identifier == "all"
-        link_to(
-          "@all",
-          namespace_project_url(project.namespace, project, only_path: options[:reference_only_path]),
-          link_options
-        )
-      elsif namespace = Namespace.find_by(path: identifier)
-        url =
-          if namespace.is_a?(Group)
-            return nil unless can?(current_user, :read_group, namespace)
-            group_url(identifier, only_path: options[:reference_only_path])
-          else
-            user_url(identifier, only_path: options[:reference_only_path])
+      fix_anchors = lambda do |env|
+        name, node = env[:node_name], env[:node]
+        if name == 'a'
+          node.remove_attribute('rel')
+          if node['href'] && node['href'].match('javascript:')
+            node.remove_attribute('href')
           end
-
-        link_to("@#{identifier}", url, link_options)
-      end
-    end
-
-    def reference_label(identifier, project = @project, _ = nil)
-      if label = project.labels.find_by(id: identifier)
-        link_options = html_options.merge(
-          class: "gfm gfm-label #{html_options[:class]}"
-        )
-        link_to(
-          render_colored_label(label),
-          namespace_project_issues_path(project.namespace, project, label_name: label.name),
-          link_options
-        )
-      end
-    end
-
-    def reference_issue(identifier, project = @project, prefix_text = nil)
-      if project.default_issues_tracker?
-        if project.issue_exists? identifier
-          url = url_for_issue(identifier, project, only_path: options[:reference_only_path])
-          title = title_for_issue(identifier, project)
-          link_options = html_options.merge(
-            title: "Issue: #{title}",
-            class: "gfm gfm-issue #{html_options[:class]}"
-          )
-
-          link_to("#{prefix_text}##{identifier}", url, link_options)
-        end
-      else
-        if project.external_issue_tracker.present?
-          reference_external_issue(identifier, project,
-                                   prefix_text)
         end
       end
-    end
 
-    def reference_merge_request(identifier, project = @project, prefix_text = nil)
-      if merge_request = project.merge_requests.find_by(iid: identifier)
-        link_options = html_options.merge(
-          title: "Merge Request: #{merge_request.title}",
-          class: "gfm gfm-merge_request #{html_options[:class]}"
-        )
-        url = namespace_project_merge_request_url(project.namespace, project,
-                                                  merge_request,
-                                                  only_path: options[:reference_only_path])
-        link_to("#{prefix_text}!#{identifier}", url, link_options)
-      end
-    end
+      whitelist[:transformers].push(fix_anchors)
 
-    def reference_snippet(identifier, project = @project, _ = nil)
-      if snippet = project.snippets.find_by(id: identifier)
-        link_options = html_options.merge(
-          title: "Snippet: #{snippet.title}",
-          class: "gfm gfm-snippet #{html_options[:class]}"
-        )
-        link_to(
-          "$#{identifier}",
-          namespace_project_snippet_url(project.namespace, project, snippet,
-                                        only_path: options[:reference_only_path]),
-          link_options
-        )
-      end
-    end
-
-    def reference_commit(identifier, project = @project, prefix_text = nil)
-      if project.valid_repo? && commit = project.repository.commit(identifier)
-        link_options = html_options.merge(
-          title: commit.link_title,
-          class: "gfm gfm-commit #{html_options[:class]}"
-        )
-        prefix_text = "#{prefix_text}@" if prefix_text
-        link_to(
-          "#{prefix_text}#{identifier}",
-          namespace_project_commit_url( project.namespace, project, commit,
-                                        only_path: options[:reference_only_path]),
-          link_options
-        )
-      end
-    end
-
-    def reference_commit_range(identifier, project = @project, prefix_text = nil)
-      from_id, to_id = identifier.split(/\.{2,3}/, 2)
-
-      inclusive = identifier !~ /\.{3}/
-      from_id << "^" if inclusive
-
-      if project.valid_repo? &&
-          from = project.repository.commit(from_id) &&
-          to = project.repository.commit(to_id)
-
-        link_options = html_options.merge(
-          title: "Commits #{from_id} through #{to_id}",
-          class: "gfm gfm-commit_range #{html_options[:class]}"
-        )
-        prefix_text = "#{prefix_text}@" if prefix_text
-
-        link_to(
-          "#{prefix_text}#{identifier}",
-          namespace_project_compare_url(project.namespace, project,
-                                        from: from_id, to: to_id,
-                                        only_path: options[:reference_only_path]),
-          link_options
-        )
-      end
-    end
-
-    def reference_external_issue(identifier, project = @project, prefix_text = nil)
-      url = url_for_issue(identifier, project, only_path: options[:reference_only_path])
-      title = project.external_issue_tracker.title
-
-      link_options = html_options.merge(
-        title: "Issue in #{title}",
-        class: "gfm gfm-issue #{html_options[:class]}"
-      )
-      link_to("#{prefix_text}##{identifier}", url, link_options)
+      whitelist
     end
 
     # Turn list items that start with "[ ]" into HTML checkbox inputs.
diff --git a/lib/gitlab/markdown/commit_range_reference_filter.rb b/lib/gitlab/markdown/commit_range_reference_filter.rb
new file mode 100644
index 00000000000..0d93bf4f280
--- /dev/null
+++ b/lib/gitlab/markdown/commit_range_reference_filter.rb
@@ -0,0 +1,127 @@
+require 'html/pipeline'
+
+module Gitlab
+  module Markdown
+    # HTML filter that replaces commit range references with links. References
+    # within <pre>, <code>, <a>, and <style> elements are ignored.
+    #
+    # This filter supports cross-project references.
+    #
+    # Context options:
+    #   :project (required) - Current project, ignored when reference is
+    #                         cross-project.
+    #   :reference_class    - Custom CSS class added to reference links.
+    #   :only_path          - Generate path-only links.
+    #
+    class CommitRangeReferenceFilter < HTML::Pipeline::Filter
+      include CrossProjectReference
+
+      # Public: Find commit range references in text
+      #
+      #   CommitRangeReferenceFilter.references_in(text) do |match, commit_range, project_ref|
+      #     "<a href=...>#{commit_range}</a>"
+      #   end
+      #
+      # text - String text to search.
+      #
+      # Yields the String match, the String commit range, and an optional String
+      # of the external project reference.
+      #
+      # Returns a String replaced with the return of the block.
+      def self.references_in(text)
+        text.gsub(COMMIT_RANGE_PATTERN) do |match|
+          yield match, $~[:commit_range], $~[:project]
+        end
+      end
+
+      # Pattern used to extract commit range references from text
+      #
+      # The beginning and ending SHA1 sums can be between 6 and 40 hex
+      # characters, and the range selection can be double- or triple-dot.
+      #
+      # This pattern supports cross-project references.
+      COMMIT_RANGE_PATTERN = /(#{PROJECT_PATTERN}@)?(?<commit_range>\h{6,40}\.{2,3}\h{6,40})/
+
+      # Don't look for references in text nodes that are children of these
+      # elements.
+      IGNORE_PARENTS = %w(pre code a style).to_set
+
+      def call
+        doc.search('text()').each do |node|
+          content = node.to_html
+
+          next if project.nil?
+          next unless content.match(COMMIT_RANGE_PATTERN)
+          next if has_ancestor?(node, IGNORE_PARENTS)
+
+          html = commit_range_link_filter(content)
+
+          next if html == content
+
+          node.replace(html)
+        end
+
+        doc
+      end
+
+      # Replace commit range references in text with links to compare the commit
+      # ranges.
+      #
+      # text - String text to replace references in.
+      #
+      # Returns a String with commit range references replaced with links. All
+      # links have `gfm` and `gfm-commit_range` class names attached for
+      # styling.
+      def commit_range_link_filter(text)
+        self.class.references_in(text) do |match, commit_range, project_ref|
+          project = self.project_from_ref(project_ref)
+
+          from_id, to_id = split_commit_range(commit_range)
+
+          if valid_range?(project, from_id, to_id)
+            url = url_for_commit_range(project, from_id, to_id)
+
+            title = "Commits #{from_id} through #{to_id}"
+            klass = "gfm gfm-commit_range #{context[:reference_class]}".strip
+
+            project_ref += '@' if project_ref
+
+            %(<a href="#{url}"
+                 title="#{title}"
+                 class="#{klass}">#{project_ref}#{commit_range}</a>)
+          else
+            match
+          end
+        end
+      end
+
+      def validate
+        needs :project
+      end
+
+      def split_commit_range(range)
+        from_id, to_id = range.split(/\.{2,3}/, 2)
+        from_id << "^" if range !~ /\.{3}/
+
+        [from_id, to_id]
+      end
+
+      def valid_range?(project, from_id, to_id)
+        project.valid_repo? &&
+          project.repository.commit(from_id) &&
+          project.repository.commit(to_id)
+      end
+
+      def url_for_commit_range(project, from_id, to_id)
+        h = Rails.application.routes.url_helpers
+        h.namespace_project_compare_url(project.namespace, project,
+                                        from: from_id, to: to_id,
+                                        only_path: context[:only_path])
+      end
+
+      def project
+        context[:project]
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/commit_reference_filter.rb b/lib/gitlab/markdown/commit_reference_filter.rb
new file mode 100644
index 00000000000..5697d7d97e7
--- /dev/null
+++ b/lib/gitlab/markdown/commit_reference_filter.rb
@@ -0,0 +1,108 @@
+require 'html/pipeline'
+
+module Gitlab
+  module Markdown
+    # HTML filter that replaces commit references with links. References within
+    # <pre>, <code>, <a>, and <style> elements are ignored.
+    #
+    # This filter supports cross-project references.
+    #
+    # Context options:
+    #   :project (required) - Current project, ignored when reference is
+    #                         cross-project.
+    #   :reference_class    - Custom CSS class added to reference links.
+    #   :only_path          - Generate path-only links.
+    #
+    class CommitReferenceFilter < HTML::Pipeline::Filter
+      include CrossProjectReference
+
+      # Public: Find commit references in text
+      #
+      #   CommitReferenceFilter.references_in(text) do |match, commit, project_ref|
+      #     "<a href=...>#{commit}</a>"
+      #   end
+      #
+      # text - String text to search.
+      #
+      # Yields the String match, the String commit identifier, and an optional
+      # String of the external project reference.
+      #
+      # Returns a String replaced with the return of the block.
+      def self.references_in(text)
+        text.gsub(COMMIT_PATTERN) do |match|
+          yield match, $~[:commit], $~[:project]
+        end
+      end
+
+      # Pattern used to extract commit references from text
+      #
+      # The SHA1 sum can be between 6 and 40 hex characters.
+      #
+      # This pattern supports cross-project references.
+      COMMIT_PATTERN = /(#{PROJECT_PATTERN}@)?(?<commit>\h{6,40})/
+
+      # Don't look for references in text nodes that are children of these
+      # elements.
+      IGNORE_PARENTS = %w(pre code a style).to_set
+
+      def call
+        doc.search('text()').each do |node|
+          content = node.to_html
+
+          next if project.nil?
+          next unless content.match(COMMIT_PATTERN)
+          next if has_ancestor?(node, IGNORE_PARENTS)
+
+          html = commit_link_filter(content)
+
+          next if html == content
+
+          node.replace(html)
+        end
+
+        doc
+      end
+
+      def validate
+        needs :project
+      end
+
+      # Replace commit references in text with links to the commit specified.
+      #
+      # text - String text to replace references in.
+      #
+      # Returns a String with commit references replaced with links. All links
+      # have `gfm` and `gfm-commit` class names attached for styling.
+      def commit_link_filter(text)
+        self.class.references_in(text) do |match, commit_ref, project_ref|
+          project = self.project_from_ref(project_ref)
+
+          if project.valid_repo? && commit = project.repository.commit(commit_ref)
+            url = url_for_commit(project, commit)
+
+            title = commit.link_title
+            klass = "gfm gfm-commit #{context[:reference_class]}".strip
+
+            project_ref += '@' if project_ref
+
+            %(<a href="#{url}"
+                 title="#{title}"
+                 class="#{klass}">#{project_ref}#{commit_ref}</a>)
+          else
+            match
+          end
+        end
+      end
+
+      def url_for_commit(project, commit)
+        h = Rails.application.routes.url_helpers
+        h.namespace_project_commit_url(project.namespace, project, commit,
+                                        only_path: context[:only_path])
+      end
+
+      def project
+        context[:project]
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/cross_project_reference.rb b/lib/gitlab/markdown/cross_project_reference.rb
new file mode 100644
index 00000000000..114247d0a33
--- /dev/null
+++ b/lib/gitlab/markdown/cross_project_reference.rb
@@ -0,0 +1,26 @@
+module Gitlab
+  module Markdown
+    # Includes shared code for reference filters that support an optional
+    # cross-project reference.
+    module CrossProjectReference
+      NAMING_PATTERN  = Gitlab::Regex::NAMESPACE_REGEX_STR
+      PROJECT_PATTERN = "(?<project>#{NAMING_PATTERN}/#{NAMING_PATTERN})"
+
+      # Given a cross-project reference string, get the Project record
+      #
+      # If no valid reference is given, returns the `:project` value for the
+      # current context.
+      #
+      # ref - String reference.
+      #
+      # Returns a Project
+      def project_from_ref(ref)
+        if ref && other = Project.find_with_namespace(ref)
+          other
+        else
+          context[:project]
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/external_issue_reference_filter.rb b/lib/gitlab/markdown/external_issue_reference_filter.rb
new file mode 100644
index 00000000000..87f58b1ae79
--- /dev/null
+++ b/lib/gitlab/markdown/external_issue_reference_filter.rb
@@ -0,0 +1,94 @@
+require 'html/pipeline'
+
+module Gitlab
+  module Markdown
+    # HTML filter that replaces external issue tracker references with links.
+    # References within <pre>, <code>, <a>, and <style> elements are ignored.
+    #
+    # Context options:
+    #   :project (required) - Current project.
+    #   :reference_class    - Custom CSS class added to reference links.
+    #   :only_path          - Generate path-only links.
+    #
+    class ExternalIssueReferenceFilter < HTML::Pipeline::Filter
+      # 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(ISSUE_PATTERN) do |match|
+          yield match, $~[:issue]
+        end
+      end
+
+      # Pattern used to extract `JIRA-123` issue references from text
+      ISSUE_PATTERN = /(?<issue>([A-Z\-]+-)\d+)/
+
+      # Don't look for references in text nodes that are children of these
+      # elements.
+      IGNORE_PARENTS = %w(pre code a style).to_set
+
+      def call
+        doc.search('text()').each do |node|
+          content = node.to_html
+
+          next if project.nil?
+          next if project.default_issues_tracker?
+          next unless content.match(ISSUE_PATTERN)
+          next if has_ancestor?(node, IGNORE_PARENTS)
+
+          html = issue_link_filter(content)
+
+          next if html == content
+
+          node.replace(html)
+        end
+
+        doc
+      end
+
+      def validate
+        needs :project
+      end
+
+      # Replace `JIRA-123` issue references in text with links to the referenced
+      # issue's details page.
+      #
+      # text - String text to replace references in.
+      #
+      # Returns a String with `JIRA-123` references replaced with links. All
+      # links have `gfm` and `gfm-issue` class names attached for styling.
+      def issue_link_filter(text)
+        project = context[:project]
+
+        self.class.references_in(text) do |match, issue|
+          url = url_for_issue(issue, project, only_path: context[:only_path])
+
+          title = "Issue in #{project.external_issue_tracker.title}"
+          klass = "gfm gfm-issue #{context[:reference_class]}".strip
+
+          %(<a href="#{url}"
+               title="#{title}"
+               class="#{klass}">#{issue}</a>)
+        end
+      end
+
+      # TODO (rspeicher): Duplicates IssueReferenceFilter
+      def project
+        context[:project]
+      end
+
+      # TODO (rspeicher): Duplicates IssueReferenceFilter
+      def url_for_issue(*args)
+        IssuesHelper.url_for_issue(*args)
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/issue_reference_filter.rb b/lib/gitlab/markdown/issue_reference_filter.rb
new file mode 100644
index 00000000000..ab0420da199
--- /dev/null
+++ b/lib/gitlab/markdown/issue_reference_filter.rb
@@ -0,0 +1,110 @@
+require 'html/pipeline'
+
+module Gitlab
+  module Markdown
+    # HTML filter that replaces issue references with links. References within
+    # <pre>, <code>, <a>, and <style> elements are ignored. References to issues
+    # that do not exist are ignored.
+    #
+    # This filter supports cross-project references.
+    #
+    # Context options:
+    #   :project (required) - Current project, ignored when reference is
+    #                         cross-project.
+    #   :reference_class    - Custom CSS class added to reference links.
+    #   :only_path          - Generate path-only links.
+    #
+    class IssueReferenceFilter < HTML::Pipeline::Filter
+      include CrossProjectReference
+
+      # Public: Find `#123` issue references in text
+      #
+      #   IssueReferenceFilter.references_in(text) do |match, issue, project_ref|
+      #     "<a href=...>##{issue}</a>"
+      #   end
+      #
+      # text - String text to search.
+      #
+      # Yields the String match, the Integer issue ID, and an optional String of
+      # the external project reference.
+      #
+      # Returns a String replaced with the return of the block.
+      def self.references_in(text)
+        text.gsub(ISSUE_PATTERN) do |match|
+          yield match, $~[:issue].to_i, $~[:project]
+        end
+      end
+
+      # Pattern used to extract `#123` issue references from text
+      #
+      # This pattern supports cross-project references.
+      ISSUE_PATTERN = /#{PROJECT_PATTERN}?\#(?<issue>([a-zA-Z\-]+-)?\d+)/
+
+      # Don't look for references in text nodes that are children of these
+      # elements.
+      IGNORE_PARENTS = %w(pre code a style).to_set
+
+      def call
+        doc.search('text()').each do |node|
+          content = node.to_html
+
+          next if project.nil?
+          next unless project.default_issues_tracker?
+          next unless content.match(ISSUE_PATTERN)
+          next if has_ancestor?(node, IGNORE_PARENTS)
+
+          html = issue_link_filter(content)
+
+          next if html == content
+
+          node.replace(html)
+        end
+
+        doc
+      end
+
+      def validate
+        needs :project
+      end
+
+      # Replace `#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 `#123` references replaced with links. All links
+      # have `gfm` and `gfm-issue` class names attached for styling.
+      def issue_link_filter(text)
+        self.class.references_in(text) do |match, issue, project_ref|
+          project = self.project_from_ref(project_ref)
+
+          if project.issue_exists?(issue)
+            # FIXME: Ugly
+            url = url_for_issue(issue, project, only_path: context[:only_path])
+
+            title = "Issue: #{title_for_issue(issue, project)}"
+            klass = "gfm gfm-issue #{context[:reference_class]}".strip
+
+            %(<a href="#{url}"
+                 title="#{title}"
+                 class="#{klass}">#{project_ref}##{issue}</a>)
+          else
+            match
+          end
+        end
+      end
+
+      def project
+        context[:project]
+      end
+
+      def url_for_issue(*args)
+        IssuesHelper.url_for_issue(*args)
+      end
+
+      def title_for_issue(*args)
+        IssuesHelper.title_for_issue(*args)
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/label_reference_filter.rb b/lib/gitlab/markdown/label_reference_filter.rb
new file mode 100644
index 00000000000..9753d0ac0f9
--- /dev/null
+++ b/lib/gitlab/markdown/label_reference_filter.rb
@@ -0,0 +1,100 @@
+require 'html/pipeline'
+
+module Gitlab
+  module Markdown
+    # HTML filter that replaces label references with links. References within
+    # <pre>, <code>, <a>, and <style> elements are ignored.
+    #
+    # Context options:
+    #   :project (required) - Current project.
+    #   :reference_class    - Custom CSS class added to reference links.
+    #   :only_path          - Generate path-only links.
+    #
+    class LabelReferenceFilter < HTML::Pipeline::Filter
+      # Public: Find label references in text
+      #
+      #   LabelReferenceFilter.references_in(text) do |match, label|
+      #     "<a href=...>#{label}</a>"
+      #   end
+      #
+      # text - String text to search.
+      #
+      # Yields the String match and the Integer label ID.
+      #
+      # Returns a String replaced with the return of the block.
+      def self.references_in(text)
+        text.gsub(LABEL_PATTERN) do |match|
+          yield match, $~[:label].to_i
+        end
+      end
+
+      # Pattern used to extract label references from text
+      #
+      # This pattern supports cross-project references.
+      LABEL_PATTERN = /~(?<label>\d+)/
+
+      # Don't look for references in text nodes that are children of these
+      # elements.
+      IGNORE_PARENTS = %w(pre code a style).to_set
+
+      def call
+        doc.search('text()').each do |node|
+          content = node.to_html
+
+          next if project.nil?
+          next unless content.match(LABEL_PATTERN)
+          next if has_ancestor?(node, IGNORE_PARENTS)
+
+          html = label_link_filter(content)
+
+          next if html == content
+
+          node.replace(html)
+        end
+
+        doc
+      end
+
+      def validate
+        needs :project
+      end
+
+      # Replace label references in text with links to the label specified.
+      #
+      # text - String text to replace references in.
+      #
+      # Returns a String with label references replaced with links. All links
+      # have `gfm` and `gfm-label` class names attached for styling.
+      def label_link_filter(text)
+        project = context[:project]
+
+        self.class.references_in(text) do |match, id|
+          if label = project.labels.find_by(id: id)
+            url = url_for_label(project, label)
+
+            klass = "gfm gfm-label #{context[:reference_class]}".strip
+
+            %(<a href="#{url}" class="#{klass}">#{render_colored_label(label)}</a>)
+          else
+            match
+          end
+        end
+      end
+
+      def url_for_label(project, label)
+        h = Rails.application.routes.url_helpers
+        h.namespace_project_issues_path(project.namespace, project,
+                                        label_name: label.name,
+                                        only_path: context[:only_path])
+      end
+
+      def render_colored_label(label)
+        LabelsHelper.render_colored_label(label)
+      end
+
+      def project
+        context[:project]
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/merge_request_reference_filter.rb b/lib/gitlab/markdown/merge_request_reference_filter.rb
new file mode 100644
index 00000000000..96a0c92942d
--- /dev/null
+++ b/lib/gitlab/markdown/merge_request_reference_filter.rb
@@ -0,0 +1,107 @@
+require 'html/pipeline'
+
+module Gitlab
+  module Markdown
+    # HTML filter that replaces merge request references with links. References
+    # within <pre>, <code>, <a>, and <style> elements are ignored. References to
+    # merge requests that do not exist are ignored.
+    #
+    # This filter supports cross-project references.
+    #
+    # Context options:
+    #   :project (required) - Current project, ignored when reference is
+    #                         cross-project.
+    #   :reference_class    - Custom CSS class added to reference links.
+    #   :only_path          - Generate path-only links.
+    #
+    class MergeRequestReferenceFilter < HTML::Pipeline::Filter
+      include CrossProjectReference
+
+      # Public: Find `!123` merge request references in text
+      #
+      #   MergeRequestReferenceFilter.references_in(text) do |match, merge_request, project_ref|
+      #     "<a href=...>##{merge_request}</a>"
+      #   end
+      #
+      # text - String text to search.
+      #
+      # Yields the String match, the Integer merge request ID, and an optional
+      # String of the external project reference.
+      #
+      # Returns a String replaced with the return of the block.
+      def self.references_in(text)
+        text.gsub(MERGE_REQUEST_PATTERN) do |match|
+          yield match, $~[:merge_request].to_i, $~[:project]
+        end
+      end
+
+      # Pattern used to extract `!123` merge request references from text
+      #
+      # This pattern supports cross-project references.
+      MERGE_REQUEST_PATTERN = /#{PROJECT_PATTERN}?!(?<merge_request>\d+)/
+
+      # Don't look for references in text nodes that are children of these
+      # elements.
+      IGNORE_PARENTS = %w(pre code a style).to_set
+
+      def call
+        doc.search('text()').each do |node|
+          content = node.to_html
+
+          next if project.nil?
+          next unless content.match(MERGE_REQUEST_PATTERN)
+          next if has_ancestor?(node, IGNORE_PARENTS)
+
+          html = merge_request_link_filter(content)
+
+          next if html == content
+
+          node.replace(html)
+        end
+
+        doc
+      end
+
+      def validate
+        needs :project
+      end
+
+      # Replace `!123` merge request references in text with links to the
+      # referenced merge request's details page.
+      #
+      # text - String text to replace references in.
+      #
+      # Returns a String with `!123` references replaced with links. All links
+      # have `gfm` and `gfm-merge_request` class names attached for styling.
+      def merge_request_link_filter(text)
+        self.class.references_in(text) do |match, id, project_ref|
+          project = self.project_from_ref(project_ref)
+
+          if merge_request = project.merge_requests.find_by(iid: id)
+            title = "Merge Request: #{merge_request.title}"
+            klass = "gfm gfm-merge_request #{context[:reference_class]}".strip
+
+            url = url_for_merge_request(merge_request, project)
+
+            %(<a href="#{url}"
+                 title="#{title}"
+                 class="#{klass}">#{project_ref}!#{id}</a>)
+          else
+            match
+          end
+        end
+      end
+
+      def project
+        context[:project]
+      end
+
+      # TODO (rspeicher): Cleanup
+      def url_for_merge_request(mr, project)
+        h = Rails.application.routes.url_helpers
+        h.namespace_project_merge_request_url(project.namespace, project, mr,
+                                            only_path: context[:only_path])
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/markdown/snippet_reference_filter.rb b/lib/gitlab/markdown/snippet_reference_filter.rb
new file mode 100644
index 00000000000..0e34ab4bc1e
--- /dev/null
+++ b/lib/gitlab/markdown/snippet_reference_filter.rb
@@ -0,0 +1,98 @@
+require 'html/pipeline'
+
+module Gitlab
+  module Markdown
+    # HTML filter that replaces snippet references with links. References within
+    # <pre>, <code>, <a>, and <style> elements are ignored. References to
+    # snippets that do not exist are ignored.
+    #
+    # Context options:
+    #   :project (required) - Current project.
+    #   :reference_class    - Custom CSS class added to reference links.
+    #   :only_path          - Generate path-only links.
+    #
+    class SnippetReferenceFilter < HTML::Pipeline::Filter
+      # Public: Find `$123` snippet references in text
+      #
+      #   SnippetReferenceFilter.references_in(text) do |match, snippet|
+      #     "<a href=...>$#{snippet}</a>"
+      #   end
+      #
+      # text - String text to search.
+      #
+      # Yields the String match and the Integer snippet ID.
+      #
+      # Returns a String replaced with the return of the block.
+      def self.references_in(text)
+        text.gsub(SNIPPET_PATTERN) do |match|
+          yield match, $~[:snippet].to_i
+        end
+      end
+
+      # Pattern used to extract `$123` snippet references from text
+      SNIPPET_PATTERN = /\$(?<snippet>\d+)/
+
+      # Don't look for references in text nodes that are children of these
+      # elements.
+      IGNORE_PARENTS = %w(pre code a style).to_set
+
+      def call
+        doc.search('text()').each do |node|
+          content = node.to_html
+
+          next if project.nil?
+          next unless content.match(SNIPPET_PATTERN)
+          next if has_ancestor?(node, IGNORE_PARENTS)
+
+          html = snippet_link_filter(content)
+
+          next if html == content
+
+          node.replace(html)
+        end
+
+        doc
+      end
+
+      def validate
+        needs :project
+      end
+
+      # Replace `$123` snippet references in text with links to the referenced
+      # snippets's details page.
+      #
+      # text - String text to replace references in.
+      #
+      # Returns a String with `$123` references replaced with links. All links
+      # have `gfm` and `gfm-snippet` class names attached for styling.
+      def snippet_link_filter(text)
+        project = context[:project]
+
+        self.class.references_in(text) do |match, id|
+          if snippet = project.snippets.find_by(id: id)
+            title = "Snippet: #{snippet.title}"
+            klass = "gfm gfm-snippet #{context[:reference_class]}".strip
+
+            url = url_for_snippet(snippet, project)
+
+            %(<a href="#{url}"
+                 title="#{title}"
+                 class="#{klass}">$#{id}</a>)
+          else
+            match
+          end
+        end
+      end
+
+      def project
+        context[:project]
+      end
+
+      def url_for_snippet(snippet, project)
+        h = Rails.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/user_reference_filter.rb b/lib/gitlab/markdown/user_reference_filter.rb
new file mode 100644
index 00000000000..eaf4094338b
--- /dev/null
+++ b/lib/gitlab/markdown/user_reference_filter.rb
@@ -0,0 +1,117 @@
+require 'html/pipeline'
+
+module Gitlab
+  module Markdown
+    # HTML filter that replaces user or group references with links. References
+    # within <pre>, <code>, <a>, and <style> elements are ignored.
+    #
+    # A special `@all` reference is also supported.
+    #
+    # Context options:
+    #   :project (required) - Current project.
+    #   :reference_class    - Custom CSS class added to reference links.
+    #   :only_path          - Generate path-only links.
+    #
+    class UserReferenceFilter < HTML::Pipeline::Filter
+      # 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_PATTERN) do |match|
+          yield match, $~[:user]
+        end
+      end
+
+      # Pattern used to extract `@user` user references from text
+      USER_PATTERN = /@(?<user>#{Gitlab::Regex::NAMESPACE_REGEX_STR})/
+
+      # Don't look for references in text nodes that are children of these
+      # elements.
+      IGNORE_PARENTS = %w(pre code a style).to_set
+
+      def call
+        doc.search('text()').each do |node|
+          content = node.to_html
+
+          next if project.nil?
+          next unless content.match(USER_PATTERN)
+          next if has_ancestor?(node, IGNORE_PARENTS)
+
+          html = user_link_filter(content)
+
+          next if html == content
+
+          node.replace(html)
+        end
+
+        doc
+      end
+
+      def validate
+        needs :project
+      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)
+        project = context[:project]
+
+        self.class.references_in(text) do |match, user|
+          klass = "gfm gfm-project_member #{context[:reference_class]}".strip
+
+          if user == 'all'
+            url = link_to_all(project)
+
+            %(<a href="#{url}" class="#{klass}">@#{user}</a>)
+          elsif namespace = Namespace.find_by(path: user)
+            if namespace.is_a?(Group)
+              url = group_url(user, only_path: context[:only_path])
+            else
+              url = user_url(user, only_path: context[:only_path])
+            end
+
+            %(<a href="#{url}" class="#{klass}">@#{user}</a>)
+          else
+            match
+          end
+        end
+      end
+
+      def project
+        context[:project]
+      end
+
+      # TODO (rspeicher): Cleanup
+      def group_url(*args)
+        h = Rails.application.routes.url_helpers
+        h.group_url(*args)
+      end
+
+      # TODO (rspeicher): Cleanup
+      def user_url(*args)
+        h = Rails.application.routes.url_helpers
+        h.user_url(*args)
+      end
+
+      # TODO (rspeicher): Cleanup
+      def link_to_all(project)
+        h = Rails.application.routes.url_helpers
+        h.namespace_project_url(project.namespace, project,
+                                only_path: context[:only_path])
+      end
+    end
+  end
+end
diff --git a/spec/helpers/gitlab_markdown_helper_spec.rb b/spec/helpers/gitlab_markdown_helper_spec.rb
index 944e743675c..1c88f49ff4f 100644
--- a/spec/helpers/gitlab_markdown_helper_spec.rb
+++ b/spec/helpers/gitlab_markdown_helper_spec.rb
@@ -348,56 +348,6 @@ describe GitlabMarkdownHelper do
       end
     end
 
-    describe "referencing a Jira issue" do
-      let(:actual)   { "Reference to JIRA-#{issue.iid}" }
-      let(:expected) { "http://jira.example/browse/JIRA-#{issue.iid}" }
-      let(:reference) { "JIRA-#{issue.iid}" }
-
-      before do
-        jira = @project.create_jira_service if @project.jira_service.nil?
-        properties = {"title"=>"JIRA tracker", "project_url"=>"http://jira.example/issues/?jql=project=A", "issues_url"=>"http://jira.example/browse/:id", "new_issue_url"=>"http://jira.example/secure/CreateIssue.jspa"}
-        jira.update_attributes(properties: properties, active: true)
-      end
-
-      after do
-        @project.jira_service.destroy! unless @project.jira_service.nil?
-      end
-
-      it "should link using a valid id" do
-        expect(gfm(actual)).to match(expected)
-      end
-
-      it "should link with adjacent text" do
-        # Wrap the reference in parenthesis
-        expect(gfm(actual.gsub(reference, "(#{reference})"))).to match(expected)
-
-        # Append some text to the end of the reference
-        expect(gfm(actual.gsub(reference, "#{reference}, right?"))).
-          to match(expected)
-      end
-
-      it "should keep whitespace intact" do
-        actual   = "Referenced #{reference} already."
-        expected = /Referenced <a.+>[^\s]+<\/a> already/
-        expect(gfm(actual)).to match(expected)
-      end
-
-      it "should not link with an invalid id" do
-        # Modify the reference string so it's still parsed, but is invalid
-        invalid_reference = actual.gsub(/(\d+)$/, "r45")
-        expect(gfm(invalid_reference)).to eq(invalid_reference)
-      end
-
-      it "should include a title attribute" do
-        title = "Issue in JIRA tracker"
-        expect(gfm(actual)).to match(/title="#{title}"/)
-      end
-
-      it "should include standard gfm classes" do
-        expect(gfm(actual)).to match(/class="\s?gfm gfm-issue\s?"/)
-      end
-    end
-
     describe "referencing a merge request" do
       let(:object)    { merge_request }
       let(:reference) { "!#{merge_request.iid}" }
@@ -659,7 +609,7 @@ describe GitlabMarkdownHelper do
     end
 
     it "should leave ref-like href of 'manual' links untouched" do
-      expect(markdown("why not [inspect !#{merge_request.iid}](http://example.tld/#!#{merge_request.iid})")).to eq("<p>why not <a href=\"http://example.tld/#!#{merge_request.iid}\">inspect </a><a class=\"gfm gfm-merge_request \" href=\"#{namespace_project_merge_request_path(project.namespace, project, merge_request)}\" title=\"Merge Request: #{merge_request.title}\">!#{merge_request.iid}</a><a href=\"http://example.tld/#!#{merge_request.iid}\"></a></p>\n")
+      expect(markdown("why not [inspect !#{merge_request.iid}](http://example.tld/#!#{merge_request.iid})")).to eq("<p>why not <a href=\"http://example.tld/#!#{merge_request.iid}\">inspect </a><a href=\"#{namespace_project_merge_request_path(project.namespace, project, merge_request)}\" title=\"Merge Request: #{merge_request.title}\" class=\"gfm gfm-merge_request \">!#{merge_request.iid}</a><a href=\"http://example.tld/#!#{merge_request.iid}\"></a></p>\n")
     end
 
     it "should leave ref-like src of images untouched" do
diff --git a/spec/helpers/labels_helper_spec.rb b/spec/helpers/labels_helper_spec.rb
index 1e64a201942..0b7e3b1d11f 100644
--- a/spec/helpers/labels_helper_spec.rb
+++ b/spec/helpers/labels_helper_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
 describe LabelsHelper do
-  it { expect(text_color_for_bg('#EEEEEE')).to eq('#333') }
-  it { expect(text_color_for_bg('#222E2E')).to eq('#FFF') }
+  it { expect(text_color_for_bg('#EEEEEE')).to eq('#333333') }
+  it { expect(text_color_for_bg('#222E2E')).to eq('#FFFFFF') }
 end
diff --git a/spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb b/spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
new file mode 100644
index 00000000000..08bdf05eb96
--- /dev/null
+++ b/spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
@@ -0,0 +1,105 @@
+require 'spec_helper'
+
+module Gitlab::Markdown
+  describe CommitRangeReferenceFilter do
+    include ReferenceFilterSpecHelper
+
+    let(:project) { create(:project) }
+    let(:commit1) { project.repository.commit }
+    let(:commit2) { project.repository.commit("HEAD~2") }
+
+    it 'requires project context' do
+      expect { described_class.call('Commit Range 1c002d..d200c1', {}) }.
+        to raise_error(ArgumentError, /:project/)
+    end
+
+    %w(pre code a style).each do |elem|
+      it "ignores valid references contained inside '#{elem}' element" do
+        exp = act = "<#{elem}>Commit Range #{commit1.id}..#{commit2.id}</#{elem}>"
+        expect(filter(act).to_html).to eq exp
+      end
+    end
+
+    context 'internal reference' do
+      let(:reference) { "#{commit1.id}...#{commit2.id}" }
+      let(:reference2) { "#{commit1.id}..#{commit2.id}" }
+
+      it 'links to a valid two-dot reference' do
+        doc = filter("See #{reference2}")
+
+        expect(doc.css('a').first.attr('href')).
+          to eq urls.namespace_project_compare_url(project.namespace, project, from: "#{commit1.id}^", to: commit2.id)
+      end
+
+      it 'links to a valid three-dot reference' do
+        doc = filter("See #{reference}")
+
+        expect(doc.css('a').first.attr('href')).
+          to eq urls.namespace_project_compare_url(project.namespace, project, from: commit1.id, to: commit2.id)
+      end
+
+      it 'links with adjacent text' do
+        doc = filter("See (#{reference}.)")
+        expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
+      end
+
+      it 'ignores invalid issue IDs' do
+        exp = act = "See #{commit1.id.reverse}...#{commit2.id}"
+
+        expect(project).to receive(:valid_repo?).and_return(true)
+        expect(project.repository).to receive(:commit).with(commit1.id.reverse)
+        expect(filter(act).to_html).to eq exp
+      end
+
+      it 'includes a title attribute' do
+        doc = filter("See #{reference}")
+        expect(doc.css('a').first.attr('title')).to eq "Commits #{commit1.id} through #{commit2.id}"
+      end
+
+      it 'includes default classes' do
+        doc = filter("See #{reference}")
+        expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-commit_range'
+      end
+
+      it 'includes an optional custom class' do
+        doc = filter("See #{reference}", reference_class: 'custom')
+        expect(doc.css('a').first.attr('class')).to include 'custom'
+      end
+
+      it 'supports an :only_path option' do
+        doc = filter("See #{reference}", only_path: true)
+        link = doc.css('a').first.attr('href')
+
+        expect(link).not_to match %r(https?://)
+        expect(link).to eq urls.namespace_project_compare_url(project.namespace, project, from: commit1.id, to: commit2.id, only_path: true)
+      end
+    end
+
+    # TODO (rspeicher): Remove or re-enable
+    # context 'cross-project reference' do
+    #   let(:namespace) { create(:namespace, name: 'cross-reference') }
+    #   let(:project2)  { create(:project, namespace: namespace) }
+    #   let(:commit1)   { project.repository.commit }
+    #   let(:commit2)   { project.repository.commit("HEAD~2") }
+    #   let(:reference) { "#{project2.path_with_namespace}@#{commit.id}" }
+
+    #   it 'links to a valid reference' do
+    #     doc = filter("See #{reference}")
+
+    #     expect(doc.css('a').first.attr('href')).
+    #       to eq urls.namespace_project_commit_url(project2.namespace, project2, commit.id)
+    #   end
+
+    #   it 'links with adjacent text' do
+    #     doc = filter("Fixed (#{reference}.)")
+    #     expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
+    #   end
+
+    #   it 'ignores invalid issue IDs on the referenced project' do
+    #     exp = act = "Fixed #{project2.path_with_namespace}##{commit.id.reverse}"
+
+    #     expect(filter(act).to_html).to eq exp
+    #   end
+    # end
+  end
+end
diff --git a/spec/lib/gitlab/markdown/commit_reference_filter_spec.rb b/spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
new file mode 100644
index 00000000000..15851d3bd34
--- /dev/null
+++ b/spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
@@ -0,0 +1,98 @@
+require 'spec_helper'
+
+module Gitlab::Markdown
+  describe CommitReferenceFilter do
+    include ReferenceFilterSpecHelper
+
+    let(:project) { create(:project) }
+    let(:commit)  { project.repository.commit }
+
+    it 'requires project context' do
+      expect { described_class.call('Commit 1c002d', {}) }.
+        to raise_error(ArgumentError, /:project/)
+    end
+
+    %w(pre code a style).each do |elem|
+      it "ignores valid references contained inside '#{elem}' element" do
+        exp = act = "<#{elem}>Commit #{commit.id}</#{elem}>"
+        expect(filter(act).to_html).to eq exp
+      end
+    end
+
+    context 'internal reference' do
+      let(:reference) { commit.id }
+
+      # Let's test a variety of commit SHA sizes just to be paranoid
+      [6, 8, 12, 18, 20, 32, 40].each do |size|
+        it "links to a valid reference of #{size} characters" do
+          doc = filter("See #{reference[0...size]}")
+
+          expect(doc.css('a').first.text).to eq reference[0...size]
+          expect(doc.css('a').first.attr('href')).
+            to eq urls.namespace_project_commit_url(project.namespace, project, reference)
+        end
+      end
+
+      it 'links with adjacent text' do
+        doc = filter("See (#{reference}.)")
+        expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
+      end
+
+      it 'ignores invalid issue IDs' do
+        exp = act = "See #{reference.reverse}"
+
+        expect(project).to receive(:valid_repo?).and_return(true)
+        expect(project.repository).to receive(:commit).with(reference.reverse)
+        expect(filter(act).to_html).to eq exp
+      end
+
+      it 'includes a title attribute' do
+        doc = filter("See #{reference}")
+        expect(doc.css('a').first.attr('title')).to eq commit.link_title
+      end
+
+      it 'includes default classes' do
+        doc = filter("See #{reference}")
+        expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-commit'
+      end
+
+      it 'includes an optional custom class' do
+        doc = filter("See #{reference}", reference_class: 'custom')
+        expect(doc.css('a').first.attr('class')).to include 'custom'
+      end
+
+      it 'supports an :only_path context' do
+        doc = filter("See #{reference}", only_path: true)
+        link = doc.css('a').first.attr('href')
+
+        expect(link).not_to match %r(https?://)
+        expect(link).to eq urls.namespace_project_commit_url(project.namespace, project, reference, only_path: true)
+      end
+    end
+
+    context 'cross-project reference' do
+      let(:namespace) { create(:namespace, name: 'cross-reference') }
+      let(:project2)  { create(:project, namespace: namespace) }
+      let(:commit)    { project.repository.commit }
+      let(:reference) { "#{project2.path_with_namespace}@#{commit.id}" }
+
+      it 'links to a valid reference' do
+        doc = filter("See #{reference}")
+
+        expect(doc.css('a').first.attr('href')).
+          to eq urls.namespace_project_commit_url(project2.namespace, project2, commit.id)
+      end
+
+      it 'links with adjacent text' do
+        doc = filter("Fixed (#{reference}.)")
+        expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
+      end
+
+      it 'ignores invalid issue IDs on the referenced project' do
+        exp = act = "Fixed #{project2.path_with_namespace}##{commit.id.reverse}"
+
+        expect(filter(act).to_html).to eq exp
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/markdown/cross_project_reference_spec.rb b/spec/lib/gitlab/markdown/cross_project_reference_spec.rb
new file mode 100644
index 00000000000..2a3814c8499
--- /dev/null
+++ b/spec/lib/gitlab/markdown/cross_project_reference_spec.rb
@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+module Gitlab::Markdown
+  describe CrossProjectReference do
+    include CrossProjectReference
+
+    describe '#project_from_ref' do
+      let(:project) { double('project') }
+
+      it 'returns a project from a valid reference' do
+        expect(Project).to receive(:find_with_namespace).with('cross-reference/foo').and_return(project)
+
+        expect(project_from_ref('cross-reference/foo')).to eq project
+      end
+
+      it 'returns the project from context when reference is invalid' do
+        expect(self).to receive(:context).and_return({project: project})
+
+        expect(project_from_ref('invalid/reference')).to eq project
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb b/spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb
new file mode 100644
index 00000000000..37c91195202
--- /dev/null
+++ b/spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb
@@ -0,0 +1,101 @@
+require 'spec_helper'
+
+module Gitlab::Markdown
+  describe ExternalIssueReferenceFilter do
+    include ReferenceFilterSpecHelper
+
+    def helper
+      IssuesHelper
+    end
+
+    let(:project) { create(:empty_project) }
+    let(:issue)   { double('issue', iid: 123) }
+
+    context 'JIRA issue references' do
+      let(:reference) { "JIRA-#{issue.iid}" }
+
+      before do
+        jira = project.create_jira_service
+
+        props = {
+          'title'         => 'JIRA tracker',
+          'project_url'   => 'http://jira.example/issues/?jql=project=A',
+          'issues_url'    => 'http://jira.example/browse/:id',
+          'new_issue_url' => 'http://jira.example/secure/CreateIssue.jspa'
+        }
+
+        jira.update_attributes(properties: props, active: true)
+      end
+
+      after do
+        project.jira_service.destroy
+      end
+
+      it 'requires project context' do
+        expect { described_class.call('Issue JIRA-123', {}) }.
+          to raise_error(ArgumentError, /:project/)
+      end
+
+      %w(pre code a style).each do |elem|
+        it "ignores valid references contained inside '#{elem}' element" do
+          exp = act = "<#{elem}>Issue JIRA-#{issue.iid}</#{elem}>"
+          expect(filter(act).to_html).to eq exp
+        end
+      end
+
+      it 'ignores valid references when using default tracker' do
+        expect(project).to receive(:default_issues_tracker?).and_return(true)
+
+        exp = act = "Issue #{reference}"
+        expect(filter(act).to_html).to eq exp
+      end
+
+      %w(pre code a style).each do |elem|
+        it "ignores references contained inside '#{elem}' element" do
+          exp = act = "<#{elem}>Issue #{reference}</#{elem}>"
+          expect(filter(act).to_html).to eq exp
+        end
+      end
+
+      it 'links to a valid reference' do
+        doc = filter("Issue #{reference}")
+        expect(doc.css('a').first.attr('href'))
+          .to eq helper.url_for_issue(reference, project)
+      end
+
+      it 'links to the external tracker' do
+        doc = filter("Issue #{reference}")
+        link = doc.css('a').first.attr('href')
+
+        expect(link).to eq "http://jira.example/browse/#{reference}"
+      end
+
+      it 'links with adjacent text' do
+        doc = filter("Issue (#{reference}.)")
+        expect(doc.to_html).to match(/\(<a.+>#{reference}<\/a>\.\)/)
+      end
+
+      it 'includes a title attribute' do
+        doc = filter("Issue #{reference}")
+        expect(doc.css('a').first.attr('title')).to eq "Issue in JIRA tracker"
+      end
+
+      it 'includes default classes' do
+        doc = filter("Issue #{reference}")
+        expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-issue'
+      end
+
+      it 'includes an optional custom class' do
+        doc = filter("Issue #{reference}", reference_class: 'custom')
+        expect(doc.css('a').first.attr('class')).to include 'custom'
+      end
+
+      it 'supports an :only_path context' do
+        doc = filter("Issue #{reference}", only_path: true)
+        link = doc.css('a').first.attr('href')
+
+        expect(link).to eq helper.url_for_issue("#{reference}", project, only_path: true)
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/markdown/issue_reference_filter_spec.rb b/spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
new file mode 100644
index 00000000000..75b3fccf325
--- /dev/null
+++ b/spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
@@ -0,0 +1,104 @@
+require 'spec_helper'
+
+module Gitlab::Markdown
+  describe IssueReferenceFilter do
+    include ReferenceFilterSpecHelper
+
+    def helper
+      IssuesHelper
+    end
+
+    let(:project) { create(:empty_project) }
+    let(:issue)   { create(:issue, project: project) }
+
+    it 'requires project context' do
+      expect { described_class.call('Issue #123', {}) }.
+        to raise_error(ArgumentError, /:project/)
+    end
+
+    it 'ignores valid references when using non-default tracker' do
+      expect(project).to receive(:default_issues_tracker?).and_return(false)
+
+      exp = act = "Issue ##{issue.iid}"
+      expect(filter(act).to_html).to eq exp
+    end
+
+    %w(pre code a style).each do |elem|
+      it "ignores valid references contained inside '#{elem}' element" do
+        exp = act = "<#{elem}>Issue ##{issue.iid}</#{elem}>"
+        expect(filter(act).to_html).to eq exp
+      end
+    end
+
+    context 'internal reference' do
+      let(:reference) { "##{issue.iid}" }
+
+      it 'links to a valid reference' do
+        doc = filter("See #{reference}")
+
+        expect(doc.css('a').first.attr('href')).
+          to eq helper.url_for_issue(issue.iid, project)
+      end
+
+      it 'links with adjacent text' do
+        doc = filter("Fixed (#{reference}.)")
+        expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
+      end
+
+      it 'ignores invalid issue IDs' do
+        exp = act = "Fixed ##{issue.iid + 1}"
+
+        expect(project).to receive(:issue_exists?).with(issue.iid + 1)
+        expect(filter(act).to_html).to eq exp
+      end
+
+      it 'includes a title attribute' do
+        doc = filter("Issue #{reference}")
+        expect(doc.css('a').first.attr('title')).to eq "Issue: #{issue.title}"
+      end
+
+      it 'includes default classes' do
+        doc = filter("Issue #{reference}")
+        expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-issue'
+      end
+
+      it 'includes an optional custom class' do
+        doc = filter("Issue #{reference}", reference_class: 'custom')
+        expect(doc.css('a').first.attr('class')).to include 'custom'
+      end
+
+      it 'supports an :only_path context' do
+        doc = filter("Issue #{reference}", only_path: true)
+        link = doc.css('a').first.attr('href')
+
+        expect(link).not_to match %r(https?://)
+        expect(link).to eq helper.url_for_issue(issue.iid, project, only_path: true)
+      end
+    end
+
+    context 'cross-project reference' do
+      let(:namespace) { create(:namespace, name: 'cross-reference') }
+      let(:project2)  { create(:empty_project, namespace: namespace) }
+      let(:issue)     { create(:issue, project: project2) }
+      let(:reference) { "#{project2.path_with_namespace}##{issue.iid}" }
+
+      it 'links to a valid reference' do
+        doc = filter("See #{reference}")
+
+        expect(doc.css('a').first.attr('href')).
+          to eq helper.url_for_issue(issue.iid, project2)
+      end
+
+      it 'links with adjacent text' do
+        doc = filter("Fixed (#{reference}.)")
+        expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
+      end
+
+      it 'ignores invalid issue IDs on the referenced project' do
+        exp = act = "Fixed #{project2.path_with_namespace}##{issue.iid + 1}"
+
+        expect(filter(act).to_html).to eq exp
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/markdown/label_reference_filter_spec.rb b/spec/lib/gitlab/markdown/label_reference_filter_spec.rb
new file mode 100644
index 00000000000..49243484c95
--- /dev/null
+++ b/spec/lib/gitlab/markdown/label_reference_filter_spec.rb
@@ -0,0 +1,72 @@
+require 'spec_helper'
+require 'html/pipeline'
+
+module Gitlab::Markdown
+  describe LabelReferenceFilter do
+    include ReferenceFilterSpecHelper
+
+    let(:project)   { create(:empty_project) }
+    let(:label)     { create(:label, project: project) }
+    let(:reference) { "~#{label.id}" }
+
+    it 'requires project context' do
+      expect { described_class.call('Label ~123', {}) }.
+        to raise_error(ArgumentError, /:project/)
+    end
+
+    %w(pre code a style).each do |elem|
+      it "ignores valid references contained inside '#{elem}' element" do
+        exp = act = "<#{elem}>Label #{reference}</#{elem}>"
+        expect(filter(act).to_html).to eq exp
+      end
+    end
+
+    it 'links to a valid reference' do
+      doc = filter("See #{reference}")
+
+      expect(doc.css('a').first.attr('href')).to eq urls.
+        namespace_project_issues_url(project.namespace, project, label_name: label.name)
+    end
+
+    it 'links with adjacent text' do
+      doc = filter("Label (#{reference}.)")
+      expect(doc.to_html).to match(%r(\(<a.+><span.+>#{label.name}</span></a>\.\)))
+    end
+
+    it 'ignores invalid label IDs' do
+      exp = act = "Label ~#{label.id + 1}"
+
+      expect(filter(act).to_html).to eq exp
+    end
+
+    it 'includes default classes' do
+      doc = filter("Label #{reference}")
+      expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-label'
+    end
+
+    it 'includes an optional custom class' do
+      doc = filter("Label #{reference}", reference_class: 'custom')
+      expect(doc.css('a').first.attr('class')).to include 'custom'
+    end
+
+    it 'supports an :only_path context' do
+      doc = filter("Label #{reference}", only_path: true)
+      link = doc.css('a').first.attr('href')
+
+      expect(link).not_to match %r(https?://)
+      expect(link).to eq urls.namespace_project_issues_url(project.namespace, project, label_name: label.name, only_path: true)
+    end
+
+    describe 'label span element' do
+      it 'includes default classes' do
+        doc = filter("Label #{reference}")
+        expect(doc.css('a span').first.attr('class')).to eq 'label color-label'
+      end
+
+      it 'includes a style attribute' do
+        doc = filter("Label #{reference}")
+        expect(doc.css('a span').first.attr('style')).to match(/\Abackground-color: #\h{6}; color: #\h{6}\z/)
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb b/spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb
new file mode 100644
index 00000000000..17bb50b157b
--- /dev/null
+++ b/spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb
@@ -0,0 +1,93 @@
+require 'spec_helper'
+
+module Gitlab::Markdown
+  describe MergeRequestReferenceFilter do
+    include ReferenceFilterSpecHelper
+
+    let(:project) { create(:project) }
+    let(:merge)   { create(:merge_request, source_project: project) }
+
+    it 'requires project context' do
+      expect { described_class.call('MergeRequest !123', {}) }.
+        to raise_error(ArgumentError, /:project/)
+    end
+
+    %w(pre code a style).each do |elem|
+      it "ignores valid references contained inside '#{elem}' element" do
+        exp = act = "<#{elem}>Merge !#{merge.iid}</#{elem}>"
+        expect(filter(act).to_html).to eq exp
+      end
+    end
+
+    context 'internal reference' do
+      let(:reference) { "!#{merge.iid}" }
+
+      it 'links to a valid reference' do
+        doc = filter("See #{reference}")
+
+        expect(doc.css('a').first.attr('href')).to eq urls.
+          namespace_project_merge_request_url(project.namespace, project, merge)
+      end
+
+      it 'links with adjacent text' do
+        doc = filter("Merge (#{reference}.)")
+        expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
+      end
+
+      it 'ignores invalid merge IDs' do
+        exp = act = "Merge !#{merge.iid + 1}"
+
+        expect(filter(act).to_html).to eq exp
+      end
+
+      it 'includes a title attribute' do
+        doc = filter("Merge #{reference}")
+        expect(doc.css('a').first.attr('title')).to eq "Merge Request: #{merge.title}"
+      end
+
+      it 'includes default classes' do
+        doc = filter("Merge #{reference}")
+        expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-merge_request'
+      end
+
+      it 'includes an optional custom class' do
+        doc = filter("Merge #{reference}", reference_class: 'custom')
+        expect(doc.css('a').first.attr('class')).to include 'custom'
+      end
+
+      it 'supports an :only_path context' do
+        doc = filter("Merge #{reference}", only_path: true)
+        link = doc.css('a').first.attr('href')
+
+        expect(link).not_to match %r(https?://)
+        expect(link).to eq urls.namespace_project_merge_request_url(project.namespace, project, merge, only_path: true)
+      end
+    end
+
+    context 'cross-project reference' do
+      let(:namespace) { create(:namespace, name: 'cross-reference') }
+      let(:project2)  { create(:project, namespace: namespace) }
+      let(:merge)     { create(:merge_request, source_project: project2) }
+      let(:reference) { "#{project2.path_with_namespace}!#{merge.iid}" }
+
+      it 'links to a valid reference' do
+        doc = filter("See #{reference}")
+
+        expect(doc.css('a').first.attr('href')).
+          to eq urls.namespace_project_merge_request_url(project2.namespace,
+                                                         project, merge)
+      end
+
+      it 'links with adjacent text' do
+        doc = filter("Merge (#{reference}.)")
+        expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
+      end
+
+      it 'ignores invalid merge IDs on the referenced project' do
+        exp = act = "Merge #{project2.path_with_namespace}!#{merge.iid + 1}"
+
+        expect(filter(act).to_html).to eq exp
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb b/spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
new file mode 100644
index 00000000000..d79a7e544a3
--- /dev/null
+++ b/spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
@@ -0,0 +1,64 @@
+require 'spec_helper'
+
+module Gitlab::Markdown
+  describe SnippetReferenceFilter do
+    include ReferenceFilterSpecHelper
+
+    let(:project)   { create(:empty_project) }
+    let(:snippet)   { create(:project_snippet, project: project) }
+    let(:reference) { "$#{snippet.id}" }
+
+    it 'requires project context' do
+      expect { described_class.call('Snippet $123', {}) }.
+        to raise_error(ArgumentError, /:project/)
+    end
+
+    %w(pre code a style).each do |elem|
+      it "ignores valid references contained inside '#{elem}' element" do
+        exp = act = "<#{elem}>Snippet #{reference}</#{elem}>"
+        expect(filter(act).to_html).to eq exp
+      end
+    end
+
+    it 'links to a valid reference' do
+      doc = filter("See #{reference}")
+
+      expect(doc.css('a').first.attr('href')).to eq urls.
+        namespace_project_snippet_url(project.namespace, project, snippet)
+    end
+
+    it 'links with adjacent text' do
+      doc = filter("Snippet (#{reference}.)")
+      expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
+    end
+
+    it 'ignores invalid snippet IDs' do
+      exp = act = "Snippet $#{snippet.id + 1}"
+
+      expect(filter(act).to_html).to eq exp
+    end
+
+    it 'includes a title attribute' do
+      doc = filter("Snippet #{reference}")
+      expect(doc.css('a').first.attr('title')).to eq "Snippet: #{snippet.title}"
+    end
+
+    it 'includes default classes' do
+      doc = filter("Snippet #{reference}")
+      expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-snippet'
+    end
+
+    it 'includes an optional custom class' do
+      doc = filter("Snippet #{reference}", reference_class: 'custom')
+      expect(doc.css('a').first.attr('class')).to include 'custom'
+    end
+
+    it 'supports an :only_path context' do
+      doc = filter("Snippet #{reference}", only_path: true)
+      link = doc.css('a').first.attr('href')
+
+      expect(link).not_to match %r(https?://)
+      expect(link).to eq urls.namespace_project_snippet_url(project.namespace, project, snippet, only_path: true)
+    end
+  end
+end
diff --git a/spec/lib/gitlab/markdown/user_reference_filter_spec.rb b/spec/lib/gitlab/markdown/user_reference_filter_spec.rb
new file mode 100644
index 00000000000..72f0746f0e2
--- /dev/null
+++ b/spec/lib/gitlab/markdown/user_reference_filter_spec.rb
@@ -0,0 +1,87 @@
+require 'spec_helper'
+
+module Gitlab::Markdown
+  describe UserReferenceFilter do
+    include ReferenceFilterSpecHelper
+
+    let(:project) { create(:empty_project) }
+    let(:user)    { create(:user) }
+
+    it 'requires project context' do
+      expect { described_class.call('Example @mention', {}) }.
+        to raise_error(ArgumentError, /:project/)
+    end
+
+    it 'ignores invalid users' do
+      exp = act = 'Hey @somebody'
+      expect(filter(act).to_html).to eq(exp)
+    end
+
+    %w(pre code a style).each do |elem|
+      it "ignores valid references contained inside '#{elem}' element" do
+        exp = act = "<#{elem}>Hey @#{user.username}</#{elem}>"
+        expect(filter(act).to_html).to eq exp
+      end
+    end
+
+    context 'mentioning a user' do
+      it 'links to a User' do
+        doc = filter("Hey @#{user.username}")
+        expect(doc.css('a').first.attr('href')).to eq urls.user_url(user)
+      end
+
+      # TODO (rspeicher): This test might be overkill
+      it 'links to a User with a period' do
+        user = create(:user, name: 'alphA.Beta')
+
+        doc = filter("Hey @#{user.username}")
+        expect(doc.css('a').length).to eq 1
+      end
+
+      # TODO (rspeicher): This test might be overkill
+      it 'links to a User with an underscore' do
+        user = create(:user, name: 'ping_pong_king')
+
+        doc = filter("Hey @#{user.username}")
+        expect(doc.css('a').length).to eq 1
+      end
+    end
+
+    it 'links to a Group' do
+      group = create(:group)
+
+      doc = filter("Hey @#{group.name}")
+      expect(doc.css('a').first.attr('href')).to eq urls.group_url(group)
+    end
+
+    it 'links with adjacent text' do
+      doc = filter("Mention me (@#{user.username}.)")
+      expect(doc.to_html).to match(/\(<a.+>@#{user.username}<\/a>\.\)/)
+    end
+
+    it 'supports a special @all mention' do
+      doc = filter("Hey @all")
+      expect(doc.css('a').length).to eq 1
+      expect(doc.css('a').first.attr('href'))
+        .to eq urls.namespace_project_url(project.namespace, project)
+    end
+
+    it 'includes default classes' do
+      doc = filter("Hey @#{user.username}")
+      expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-project_member'
+    end
+
+    it 'includes an optional custom class' do
+      doc = filter("Hey @#{user.username}", reference_class: 'custom')
+      expect(doc.css('a').first.attr('class')).to include 'custom'
+    end
+
+    it 'supports an :only_path context' do
+      doc = filter("Hey @#{user.username}", only_path: true)
+      link = doc.css('a').first.attr('href')
+
+      expect(link).not_to match %r(https?://)
+      expect(link).to eq urls.user_path(user)
+    end
+  end
+end
diff --git a/spec/support/reference_filter_spec_helper.rb b/spec/support/reference_filter_spec_helper.rb
new file mode 100644
index 00000000000..e4138405602
--- /dev/null
+++ b/spec/support/reference_filter_spec_helper.rb
@@ -0,0 +1,37 @@
+# Common methods and setup for Gitlab::Markdown reference filter specs
+#
+# Must be included into specs manually
+module ReferenceFilterSpecHelper
+  extend ActiveSupport::Concern
+
+  included do
+    before { set_default_url_options }
+  end
+
+  # Allow *_url helpers to work
+  def set_default_url_options
+    Rails.application.routes.default_url_options = {
+      host: 'example.foo'
+    }
+  end
+
+  # Shortcut to Rails' auto-generated routes helpers, to avoid including the
+  # module
+  def urls
+    Rails.application.routes.url_helpers
+  end
+
+  # Perform `call` on the described class
+  #
+  # Automatically passes the current `project` value to the context if none is
+  # provided.
+  #
+  # html     - String text to pass to the filter's `call` method.
+  # contexts - Hash context for the filter. (default: {project: project})
+  #
+  # Returns the String text returned by the filter's `call` method.
+  def filter(html, contexts = {})
+    contexts.reverse_merge!(project: project)
+    described_class.call(html, contexts)
+  end
+end

From d520fe07ad90cb610927e833060908bdc04fa550 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 6 Apr 2015 11:18:47 -0400
Subject: [PATCH 19/80] Fix GitlabMarkdownHelper spec

---
 spec/helpers/gitlab_markdown_helper_spec.rb               | 6 +++---
 .../gitlab/markdown/commit_range_reference_filter_spec.rb | 8 ++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/spec/helpers/gitlab_markdown_helper_spec.rb b/spec/helpers/gitlab_markdown_helper_spec.rb
index 1c88f49ff4f..3454935078c 100644
--- a/spec/helpers/gitlab_markdown_helper_spec.rb
+++ b/spec/helpers/gitlab_markdown_helper_spec.rb
@@ -51,8 +51,8 @@ describe GitlabMarkdownHelper do
     end
 
     it "should not touch HTML entities" do
-      allow(@project.issues).to receive(:where).
-        with(id: '39').and_return([issue])
+      allow(@project).to receive(:issue_exists?).
+        with(39).and_return([issue])
       actual = 'We&#39;ll accept good pull requests.'
       expect(gfm(actual)).to eq("We'll accept good pull requests.")
     end
@@ -609,7 +609,7 @@ describe GitlabMarkdownHelper do
     end
 
     it "should leave ref-like href of 'manual' links untouched" do
-      expect(markdown("why not [inspect !#{merge_request.iid}](http://example.tld/#!#{merge_request.iid})")).to eq("<p>why not <a href=\"http://example.tld/#!#{merge_request.iid}\">inspect </a><a href=\"#{namespace_project_merge_request_path(project.namespace, project, merge_request)}\" title=\"Merge Request: #{merge_request.title}\" class=\"gfm gfm-merge_request \">!#{merge_request.iid}</a><a href=\"http://example.tld/#!#{merge_request.iid}\"></a></p>\n")
+      expect(markdown("why not [inspect !#{merge_request.iid}](http://example.tld/#!#{merge_request.iid})")).to eq("<p>why not <a href=\"http://example.tld/#!#{merge_request.iid}\">inspect </a><a href=\"#{namespace_project_merge_request_path(project.namespace, project, merge_request)}\" title=\"Merge Request: #{merge_request.title}\" class=\"gfm gfm-merge_request\">!#{merge_request.iid}</a><a href=\"http://example.tld/#!#{merge_request.iid}\"></a></p>\n")
     end
 
     it "should leave ref-like src of images untouched" do
diff --git a/spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb b/spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
index 08bdf05eb96..3545d7f8085 100644
--- a/spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
@@ -38,6 +38,14 @@ module Gitlab::Markdown
           to eq urls.namespace_project_compare_url(project.namespace, project, from: commit1.id, to: commit2.id)
       end
 
+      it 'links to a valid short ID' do
+        reference = "#{commit1.short_id}...#{commit2.id}"
+        reference2 = "#{commit1.id}...#{commit2.short_id}"
+
+        expect(filter("See #{reference}").css('a').first.text).to eq reference
+        expect(filter("See #{reference2}").css('a').first.text).to eq reference2
+      end
+
       it 'links with adjacent text' do
         doc = filter("See (#{reference}.)")
         expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)

From 4cb1cc2b6413329c89d1043975317001666db13d Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 6 Apr 2015 11:44:49 -0400
Subject: [PATCH 20/80] Make CommitRange and Snippets cross-referable

---
 .../markdown/snippet_reference_filter.rb      | 26 +++---
 .../commit_range_reference_filter_spec.rb     | 45 +++++-----
 .../markdown/commit_reference_filter_spec.rb  |  7 +-
 .../markdown/snippet_reference_filter_spec.rb | 89 ++++++++++++-------
 4 files changed, 98 insertions(+), 69 deletions(-)

diff --git a/lib/gitlab/markdown/snippet_reference_filter.rb b/lib/gitlab/markdown/snippet_reference_filter.rb
index 0e34ab4bc1e..42f035ce295 100644
--- a/lib/gitlab/markdown/snippet_reference_filter.rb
+++ b/lib/gitlab/markdown/snippet_reference_filter.rb
@@ -7,11 +7,14 @@ module Gitlab
     # snippets that do not exist are ignored.
     #
     # Context options:
-    #   :project (required) - Current project.
+    #   :project (required) - Current project, ignored when reference is
+    #                         cross-project.
     #   :reference_class    - Custom CSS class added to reference links.
     #   :only_path          - Generate path-only links.
     #
     class SnippetReferenceFilter < HTML::Pipeline::Filter
+      include CrossProjectReference
+
       # Public: Find `$123` snippet references in text
       #
       #   SnippetReferenceFilter.references_in(text) do |match, snippet|
@@ -20,17 +23,20 @@ module Gitlab
       #
       # text - String text to search.
       #
-      # Yields the String match and the Integer snippet ID.
+      # Yields the String match, the Integer snippet ID, and an optional String
+      # of the external project reference.
       #
       # Returns a String replaced with the return of the block.
       def self.references_in(text)
         text.gsub(SNIPPET_PATTERN) do |match|
-          yield match, $~[:snippet].to_i
+          yield match, $~[:snippet].to_i, $~[:project]
         end
       end
 
       # Pattern used to extract `$123` snippet references from text
-      SNIPPET_PATTERN = /\$(?<snippet>\d+)/
+      #
+      # This pattern supports cross-project references.
+      SNIPPET_PATTERN = /#{PROJECT_PATTERN}?\$(?<snippet>\d+)/
 
       # Don't look for references in text nodes that are children of these
       # elements.
@@ -40,7 +46,7 @@ module Gitlab
         doc.search('text()').each do |node|
           content = node.to_html
 
-          next if project.nil?
+          next if context[:project].nil?
           next unless content.match(SNIPPET_PATTERN)
           next if has_ancestor?(node, IGNORE_PARENTS)
 
@@ -66,9 +72,9 @@ module Gitlab
       # Returns a String with `$123` references replaced with links. All links
       # have `gfm` and `gfm-snippet` class names attached for styling.
       def snippet_link_filter(text)
-        project = context[:project]
+        self.class.references_in(text) do |match, id, project_ref|
+          project = self.project_from_ref(project_ref)
 
-        self.class.references_in(text) do |match, id|
           if snippet = project.snippets.find_by(id: id)
             title = "Snippet: #{snippet.title}"
             klass = "gfm gfm-snippet #{context[:reference_class]}".strip
@@ -77,17 +83,13 @@ module Gitlab
 
             %(<a href="#{url}"
                  title="#{title}"
-                 class="#{klass}">$#{id}</a>)
+                 class="#{klass}">#{project_ref}$#{id}</a>)
           else
             match
           end
         end
       end
 
-      def project
-        context[:project]
-      end
-
       def url_for_snippet(snippet, project)
         h = Rails.application.routes.url_helpers
         h.namespace_project_snippet_url(project.namespace, project, snippet,
diff --git a/spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb b/spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
index 3545d7f8085..67de23014f8 100644
--- a/spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
@@ -51,7 +51,7 @@ module Gitlab::Markdown
         expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
       end
 
-      it 'ignores invalid issue IDs' do
+      it 'ignores invalid commit IDs' do
         exp = act = "See #{commit1.id.reverse}...#{commit2.id}"
 
         expect(project).to receive(:valid_repo?).and_return(true)
@@ -83,31 +83,32 @@ module Gitlab::Markdown
       end
     end
 
-    # TODO (rspeicher): Remove or re-enable
-    # context 'cross-project reference' do
-    #   let(:namespace) { create(:namespace, name: 'cross-reference') }
-    #   let(:project2)  { create(:project, namespace: namespace) }
-    #   let(:commit1)   { project.repository.commit }
-    #   let(:commit2)   { project.repository.commit("HEAD~2") }
-    #   let(:reference) { "#{project2.path_with_namespace}@#{commit.id}" }
+    context 'cross-project reference' do
+      let(:namespace) { create(:namespace, name: 'cross-reference') }
+      let(:project2)  { create(:project, namespace: namespace) }
+      let(:commit1)   { project.repository.commit }
+      let(:commit2)   { project.repository.commit("HEAD~2") }
+      let(:reference) { "#{project2.path_with_namespace}@#{commit1.id}...#{commit2.id}" }
 
-    #   it 'links to a valid reference' do
-    #     doc = filter("See #{reference}")
+      it 'links to a valid reference' do
+        doc = filter("See #{reference}")
 
-    #     expect(doc.css('a').first.attr('href')).
-    #       to eq urls.namespace_project_commit_url(project2.namespace, project2, commit.id)
-    #   end
+        expect(doc.css('a').first.attr('href')).
+          to eq urls.namespace_project_compare_url(project2.namespace, project2, from: commit1.id, to: commit2.id)
+      end
 
-    #   it 'links with adjacent text' do
-    #     doc = filter("Fixed (#{reference}.)")
-    #     expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
-    #   end
+      it 'links with adjacent text' do
+        doc = filter("Fixed (#{reference}.)")
+        expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
+      end
 
-    #   it 'ignores invalid issue IDs on the referenced project' do
-    #     exp = act = "Fixed #{project2.path_with_namespace}##{commit.id.reverse}"
+      it 'ignores invalid commit IDs on the referenced project' do
+        exp = act = "Fixed #{project2.path_with_namespace}##{commit1.id.reverse}...#{commit2.id}"
+        expect(filter(act).to_html).to eq exp
 
-    #     expect(filter(act).to_html).to eq exp
-    #   end
-    # end
+        exp = act = "Fixed #{project2.path_with_namespace}##{commit1.id}...#{commit2.id.reverse}"
+        expect(filter(act).to_html).to eq exp
+      end
+    end
   end
 end
diff --git a/spec/lib/gitlab/markdown/commit_reference_filter_spec.rb b/spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
index 15851d3bd34..f72953fd84e 100644
--- a/spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
@@ -38,7 +38,7 @@ module Gitlab::Markdown
         expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
       end
 
-      it 'ignores invalid issue IDs' do
+      it 'ignores invalid commit IDs' do
         exp = act = "See #{reference.reverse}"
 
         expect(project).to receive(:valid_repo?).and_return(true)
@@ -88,9 +88,8 @@ module Gitlab::Markdown
         expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
       end
 
-      it 'ignores invalid issue IDs on the referenced project' do
-        exp = act = "Fixed #{project2.path_with_namespace}##{commit.id.reverse}"
-
+      it 'ignores invalid commit IDs on the referenced project' do
+        exp = act = "Committed #{project2.path_with_namespace}##{commit.id.reverse}"
         expect(filter(act).to_html).to eq exp
       end
     end
diff --git a/spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb b/spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
index d79a7e544a3..a3285998ac1 100644
--- a/spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
@@ -20,45 +20,72 @@ module Gitlab::Markdown
       end
     end
 
-    it 'links to a valid reference' do
-      doc = filter("See #{reference}")
+    context 'internal reference' do
+      it 'links to a valid reference' do
+        doc = filter("See #{reference}")
 
-      expect(doc.css('a').first.attr('href')).to eq urls.
-        namespace_project_snippet_url(project.namespace, project, snippet)
+        expect(doc.css('a').first.attr('href')).to eq urls.
+          namespace_project_snippet_url(project.namespace, project, snippet)
+      end
+
+      it 'links with adjacent text' do
+        doc = filter("Snippet (#{reference}.)")
+        expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
+      end
+
+      it 'ignores invalid snippet IDs' do
+        exp = act = "Snippet $#{snippet.id + 1}"
+
+        expect(filter(act).to_html).to eq exp
+      end
+
+      it 'includes a title attribute' do
+        doc = filter("Snippet #{reference}")
+        expect(doc.css('a').first.attr('title')).to eq "Snippet: #{snippet.title}"
+      end
+
+      it 'includes default classes' do
+        doc = filter("Snippet #{reference}")
+        expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-snippet'
+      end
+
+      it 'includes an optional custom class' do
+        doc = filter("Snippet #{reference}", reference_class: 'custom')
+        expect(doc.css('a').first.attr('class')).to include 'custom'
+      end
+
+      it 'supports an :only_path context' do
+        doc = filter("Snippet #{reference}", only_path: true)
+        link = doc.css('a').first.attr('href')
+
+        expect(link).not_to match %r(https?://)
+        expect(link).to eq urls.namespace_project_snippet_url(project.namespace, project, snippet, only_path: true)
+      end
     end
 
-    it 'links with adjacent text' do
-      doc = filter("Snippet (#{reference}.)")
-      expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
-    end
+    context 'cross-project reference' do
+      let(:namespace) { create(:namespace, name: 'cross-reference') }
+      let(:project2)  { create(:empty_project, namespace: namespace) }
+      let(:snippet)   { create(:project_snippet, project: project2) }
+      let(:reference) { "#{project2.path_with_namespace}$#{snippet.id}" }
 
-    it 'ignores invalid snippet IDs' do
-      exp = act = "Snippet $#{snippet.id + 1}"
+      it 'links to a valid reference' do
+        doc = filter("See #{reference}")
 
-      expect(filter(act).to_html).to eq exp
-    end
+        expect(doc.css('a').first.attr('href')).
+          to eq urls.namespace_project_snippet_url(project2.namespace, project2, snippet)
+      end
 
-    it 'includes a title attribute' do
-      doc = filter("Snippet #{reference}")
-      expect(doc.css('a').first.attr('title')).to eq "Snippet: #{snippet.title}"
-    end
+      it 'links with adjacent text' do
+        doc = filter("See (#{reference}.)")
+        expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
+      end
 
-    it 'includes default classes' do
-      doc = filter("Snippet #{reference}")
-      expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-snippet'
-    end
+      it 'ignores invalid snippet IDs on the referenced project' do
+        exp = act = "See #{project2.path_with_namespace}$#{snippet.id + 1}"
 
-    it 'includes an optional custom class' do
-      doc = filter("Snippet #{reference}", reference_class: 'custom')
-      expect(doc.css('a').first.attr('class')).to include 'custom'
-    end
-
-    it 'supports an :only_path context' do
-      doc = filter("Snippet #{reference}", only_path: true)
-      link = doc.css('a').first.attr('href')
-
-      expect(link).not_to match %r(https?://)
-      expect(link).to eq urls.namespace_project_snippet_url(project.namespace, project, snippet, only_path: true)
+        expect(filter(act).to_html).to eq exp
+      end
     end
   end
 end

From 02809e1cf874122bab3e269ae7362be3ad8a87bd Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 6 Apr 2015 12:16:18 -0400
Subject: [PATCH 21/80] Add more GFM reference examples to docs

---
 doc/markdown/markdown.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/doc/markdown/markdown.md b/doc/markdown/markdown.md
index 1d5fd4c8b0d..5c8b161cb6c 100644
--- a/doc/markdown/markdown.md
+++ b/doc/markdown/markdown.md
@@ -176,14 +176,18 @@ GFM will recognize the following:
 - #123 : for issues
 - !123 : for merge requests
 - $123 : for snippets
-- 1234567 : for commits
+- ~123 : for labels
+- 9ba12248 : for specific commits
+- 9ba12248...b19a04f5 : for commit range comparisons
 - \[file\](path/to/file) : for file references
 
 GFM also recognizes references to commits, issues, and merge requests in other projects:
 
 - namespace/project#123 : for issues
 - namespace/project!123 : for merge requests
-- namespace/project@1234567 : for commits
+- namespace/project$123 : for snippets
+- namespace/project@9ba12248 : for specific commits
+- namespace/project@9ba12248...b19a04f5 : for commit range comparisons
 
 ## Task Lists
 

From 77a6746a75325c59bd5c081041ac6dc374e6394d Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Tue, 7 Apr 2015 16:53:15 -0400
Subject: [PATCH 22/80] Run SanitizationFilter before our reference filters

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

diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb
index 93c279edc32..1babdc476bd 100644
--- a/lib/gitlab/markdown.rb
+++ b/lib/gitlab/markdown.rb
@@ -92,9 +92,14 @@ module Gitlab
 
     # Custom filters for html-pipeline:
     #
+    # SanitizationFilter should come first so that all generated reference HTML
+    # goes through untouched.
+    #
     # See https://gitlab.com/gitlab-org/html-pipeline-gitlab for more filters
     def filters
       [
+        HTML::Pipeline::SanitizationFilter,
+
         Gitlab::Markdown::UserReferenceFilter,
         Gitlab::Markdown::IssueReferenceFilter,
         Gitlab::Markdown::ExternalIssueReferenceFilter,
@@ -103,8 +108,8 @@ module Gitlab
         Gitlab::Markdown::CommitRangeReferenceFilter,
         Gitlab::Markdown::CommitReferenceFilter,
         Gitlab::Markdown::LabelReferenceFilter,
-        HTML::Pipeline::Gitlab::GitlabEmojiFilter,
-        HTML::Pipeline::SanitizationFilter
+
+        HTML::Pipeline::Gitlab::GitlabEmojiFilter
       ]
     end
 

From bc7c35cca0852503eb2952f47af6df07c675e844 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Wed, 8 Apr 2015 12:52:37 -0400
Subject: [PATCH 23/80] Fix ReferenceExtractor spec

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

diff --git a/spec/lib/gitlab/reference_extractor_spec.rb b/spec/lib/gitlab/reference_extractor_spec.rb
index c9fb62b61ae..f34b6f3878e 100644
--- a/spec/lib/gitlab/reference_extractor_spec.rb
+++ b/spec/lib/gitlab/reference_extractor_spec.rb
@@ -74,7 +74,7 @@ describe Gitlab::ReferenceExtractor do
   end
 
   it 'handles all possible kinds of references' do
-    accessors = Gitlab::Markdown::TYPES.map { |t| "#{t}s".to_sym }
+    accessors = described_class::TYPES.map { |t| "#{t}s".to_sym }
     expect(subject).to respond_to(*accessors)
   end
 

From c1c1ef52c36c9f22230e89cd2b0ed73adfafaeb7 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Fri, 10 Apr 2015 16:14:00 -0400
Subject: [PATCH 24/80] Remove duplicate ampersand from Label title format
 validator

---
 app/models/label.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/label.rb b/app/models/label.rb
index 1f22ed23d42..eee28acefc1 100644
--- a/app/models/label.rb
+++ b/app/models/label.rb
@@ -27,7 +27,7 @@ class Label < ActiveRecord::Base
   # Don't allow '?', '&', and ',' for label titles
   validates :title,
             presence: true,
-            format: { with: /\A[^&\?,&]+\z/ },
+            format: { with: /\A[^&\?,]+\z/ },
             uniqueness: { scope: :project_id }
 
   default_scope { order(title: :asc) }

From 189c5347bef6c182ed00e2b845cdce5678abbbce Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Fri, 10 Apr 2015 16:38:34 -0400
Subject: [PATCH 25/80] Add name-based referencing to LabelReferenceFilter

---
 lib/gitlab/markdown/label_reference_filter.rb |  43 +++++--
 .../markdown/label_reference_filter_spec.rb   | 113 +++++++++++++++---
 2 files changed, 130 insertions(+), 26 deletions(-)

diff --git a/lib/gitlab/markdown/label_reference_filter.rb b/lib/gitlab/markdown/label_reference_filter.rb
index 9753d0ac0f9..3bb84c50b93 100644
--- a/lib/gitlab/markdown/label_reference_filter.rb
+++ b/lib/gitlab/markdown/label_reference_filter.rb
@@ -13,25 +13,34 @@ module Gitlab
     class LabelReferenceFilter < HTML::Pipeline::Filter
       # Public: Find label references in text
       #
-      #   LabelReferenceFilter.references_in(text) do |match, label|
-      #     "<a href=...>#{label}</a>"
+      #   LabelReferenceFilter.references_in(text) do |match, id, name|
+      #     "<a href=...>#{Label.find(id)}</a>"
       #   end
       #
       # text - String text to search.
       #
-      # Yields the String match and the Integer label ID.
+      # 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_PATTERN) do |match|
-          yield match, $~[:label].to_i
+          yield match, $~[:label_id].to_i, $~[:label_name]
         end
       end
 
       # Pattern used to extract label references from text
       #
-      # This pattern supports cross-project references.
-      LABEL_PATTERN = /~(?<label>\d+)/
+      # TODO (rspeicher): Limit to double quotes (meh) or disallow single quotes in label names (bad).
+      LABEL_PATTERN = %r{
+        ~(
+          (?<label_id>\d+)   | # Integer-based label ID, or
+          (?<label_name>
+            [^'"&\?,\s]+     | # String-based single-word label title
+            ['"][^&\?,]+['"]   # String-based multi-word label surrounded in quotes
+          )
+        )
+      }x
 
       # Don't look for references in text nodes that are children of these
       # elements.
@@ -68,8 +77,10 @@ module Gitlab
       def label_link_filter(text)
         project = context[:project]
 
-        self.class.references_in(text) do |match, id|
-          if label = project.labels.find_by(id: id)
+        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 = "gfm gfm-label #{context[:reference_class]}".strip
@@ -92,6 +103,22 @@ module Gitlab
         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 id > 0
+          { id: id }
+        else
+          # TODO (rspeicher): Don't strip single quotes if we decide to only use double quotes for surrounding.
+          { name: name.tr('\'"', '') }
+        end
+      end
+
       def project
         context[:project]
       end
diff --git a/spec/lib/gitlab/markdown/label_reference_filter_spec.rb b/spec/lib/gitlab/markdown/label_reference_filter_spec.rb
index 49243484c95..2258889cb51 100644
--- a/spec/lib/gitlab/markdown/label_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/label_reference_filter_spec.rb
@@ -21,24 +21,6 @@ module Gitlab::Markdown
       end
     end
 
-    it 'links to a valid reference' do
-      doc = filter("See #{reference}")
-
-      expect(doc.css('a').first.attr('href')).to eq urls.
-        namespace_project_issues_url(project.namespace, project, label_name: label.name)
-    end
-
-    it 'links with adjacent text' do
-      doc = filter("Label (#{reference}.)")
-      expect(doc.to_html).to match(%r(\(<a.+><span.+>#{label.name}</span></a>\.\)))
-    end
-
-    it 'ignores invalid label IDs' do
-      exp = act = "Label ~#{label.id + 1}"
-
-      expect(filter(act).to_html).to eq exp
-    end
-
     it 'includes default classes' do
       doc = filter("Label #{reference}")
       expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-label'
@@ -68,5 +50,100 @@ module Gitlab::Markdown
         expect(doc.css('a span').first.attr('style')).to match(/\Abackground-color: #\h{6}; color: #\h{6}\z/)
       end
     end
+
+    context 'Integer-based references' do
+      it 'links to a valid reference' do
+        doc = filter("See #{reference}")
+
+        expect(doc.css('a').first.attr('href')).to eq urls.
+          namespace_project_issues_url(project.namespace, project, label_name: label.name)
+      end
+
+      it 'links with adjacent text' do
+        doc = filter("Label (#{reference}.)")
+        expect(doc.to_html).to match(%r(\(<a.+><span.+>#{label.name}</span></a>\.\)))
+      end
+
+      it 'ignores invalid label IDs' do
+        exp = act = "Label ~#{label.id + 1}"
+
+        expect(filter(act).to_html).to eq exp
+      end
+    end
+
+    context 'String-based single-word references' do
+      let(:label)     { create(:label, name: 'gfm', project: project) }
+      let(:reference) { "~#{label.name}" }
+
+      it 'links to a valid reference' do
+        doc = filter("See #{reference}")
+
+        expect(doc.css('a').first.attr('href')).to eq urls.
+          namespace_project_issues_url(project.namespace, project, label_name: label.name)
+        expect(doc.text).to eq 'See gfm'
+      end
+
+      it 'links with adjacent text' do
+        skip 'FIXME (rspeicher): This will fail, because a period and parentheses are both currently valid in label names.'
+        doc = filter("Label (#{reference}.)")
+        expect(doc.to_html).to match(%r(\(<a.+><span.+>#{label.name}</span></a>\.\)))
+      end
+
+      it 'ignores invalid label names' do
+        exp = act = "Label ~#{label.name.reverse}"
+
+        expect(filter(act).to_html).to eq exp
+      end
+    end
+
+    context 'String-based multi-word references in quotes' do
+      let(:label) { create(:label, name: 'gfm references', project: project) }
+
+      context 'in single quotes' do
+        let(:reference) { "~'#{label.name}'" }
+
+        it 'links to a valid reference' do
+          doc = filter("See #{reference}")
+
+          expect(doc.css('a').first.attr('href')).to eq urls.
+            namespace_project_issues_url(project.namespace, project, label_name: label.name)
+          expect(doc.text).to eq 'See gfm references'
+        end
+
+        it 'links with adjacent text' do
+          doc = filter("Label (#{reference}.)")
+          expect(doc.to_html).to match(%r(\(<a.+><span.+>#{label.name}</span></a>\.\)))
+        end
+
+        it 'ignores invalid label names' do
+          exp = act = "Label ~'#{label.name.reverse}'"
+
+          expect(filter(act).to_html).to eq exp
+        end
+      end
+
+      context 'in double quotes' do
+        let(:reference) { %(~"#{label.name}") }
+
+        it 'links to a valid reference' do
+          doc = filter("See #{reference}")
+
+          expect(doc.css('a').first.attr('href')).to eq urls.
+            namespace_project_issues_url(project.namespace, project, label_name: label.name)
+          expect(doc.text).to eq 'See gfm references'
+        end
+
+        it 'links with adjacent text' do
+          doc = filter("Label (#{reference}.)")
+          expect(doc.to_html).to match(%r(\(<a.+><span.+>#{label.name}</span></a>\.\)))
+        end
+
+        it 'ignores invalid label names' do
+          exp = act = %(Label ~"#{label.name.reverse}")
+
+          expect(filter(act).to_html).to eq exp
+        end
+      end
+    end
   end
 end

From 29604ff2c3d6fc81c3ac26b590f912fea15d58a6 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 13 Apr 2015 15:43:58 -0400
Subject: [PATCH 26/80] Add permission checking to UserReferenceFilter

---
 lib/gitlab/markdown/user_reference_filter.rb   | 15 ++++++++++++---
 .../markdown/user_reference_filter_spec.rb     | 18 ++++++++++++++----
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/lib/gitlab/markdown/user_reference_filter.rb b/lib/gitlab/markdown/user_reference_filter.rb
index eaf4094338b..d6798ee2158 100644
--- a/lib/gitlab/markdown/user_reference_filter.rb
+++ b/lib/gitlab/markdown/user_reference_filter.rb
@@ -78,12 +78,16 @@ module Gitlab
             %(<a href="#{url}" class="#{klass}">@#{user}</a>)
           elsif namespace = Namespace.find_by(path: user)
             if namespace.is_a?(Group)
-              url = group_url(user, only_path: context[:only_path])
+              if user_can_read_group?(namespace)
+                url = group_url(user, only_path: context[:only_path])
+                %(<a href="#{url}" class="#{klass}">@#{user}</a>)
+              else
+                match
+              end
             else
               url = user_url(user, only_path: context[:only_path])
+              %(<a href="#{url}" class="#{klass}">@#{user}</a>)
             end
-
-            %(<a href="#{url}" class="#{klass}">@#{user}</a>)
           else
             match
           end
@@ -112,6 +116,11 @@ module Gitlab
         h.namespace_project_url(project.namespace, project,
                                 only_path: context[:only_path])
       end
+
+      def user_can_read_group?(group)
+        return false if context[:current_user].blank?
+        Ability.abilities.allowed?(context[:current_user], :read_group, group)
+      end
     end
   end
 end
diff --git a/spec/lib/gitlab/markdown/user_reference_filter_spec.rb b/spec/lib/gitlab/markdown/user_reference_filter_spec.rb
index 72f0746f0e2..1704c826d5d 100644
--- a/spec/lib/gitlab/markdown/user_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/user_reference_filter_spec.rb
@@ -47,11 +47,21 @@ module Gitlab::Markdown
       end
     end
 
-    it 'links to a Group' do
-      group = create(:group)
+    context 'mentioning a group' do
+      let(:group) { create(:group) }
+      let(:user)  { create(:user) }
 
-      doc = filter("Hey @#{group.name}")
-      expect(doc.css('a').first.attr('href')).to eq urls.group_url(group)
+      it 'links to a Group that the current user can read' do
+        group.add_user(user, Gitlab::Access::DEVELOPER)
+
+        doc = filter("Hey @#{group.name}", current_user: user)
+        expect(doc.css('a').first.attr('href')).to eq urls.group_url(group)
+      end
+
+      it 'ignores references to a Group that the current user cannot read' do
+        doc = filter("Hey @#{group.name}", current_user: user)
+        expect(doc.to_html).to eq "Hey @#{group.name}"
+      end
     end
 
     it 'links with adjacent text' do

From 43c62ca3f262ac6bfbdbe36312d621dac0a12da1 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 13 Apr 2015 15:45:30 -0400
Subject: [PATCH 27/80] Remove Gitlab::Markdown from Gitlab::ReferenceExtractor

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

diff --git a/lib/gitlab/reference_extractor.rb b/lib/gitlab/reference_extractor.rb
index a502a8fe9cd..64e8a650107 100644
--- a/lib/gitlab/reference_extractor.rb
+++ b/lib/gitlab/reference_extractor.rb
@@ -3,8 +3,6 @@ module Gitlab
   class ReferenceExtractor
     attr_accessor :project, :current_user, :references
 
-    include ::Gitlab::Markdown
-
     def initialize(project, current_user = nil)
       @project = project
       @current_user = current_user
@@ -87,6 +85,72 @@ module Gitlab
 
     private
 
+    NAME_STR = Gitlab::Regex::NAMESPACE_REGEX_STR
+    PROJ_STR = "(?<project>#{NAME_STR}/#{NAME_STR})"
+
+    REFERENCE_PATTERN = %r{
+      (?<prefix>\W)?                         # Prefix
+      (                                      # Reference
+         @(?<user>#{NAME_STR})               # User name
+        |~(?<label>\d+)                      # Label ID
+        |(?<issue>([A-Z\-]+-)\d+)            # JIRA Issue ID
+        |#{PROJ_STR}?\#(?<issue>([a-zA-Z\-]+-)?\d+) # Issue ID
+        |#{PROJ_STR}?!(?<merge_request>\d+)  # MR ID
+        |\$(?<snippet>\d+)                   # Snippet ID
+        |(#{PROJ_STR}@)?(?<commit_range>[\h]{6,40}\.{2,3}[\h]{6,40}) # Commit range
+        |(#{PROJ_STR}@)?(?<commit>[\h]{6,40}) # Commit ID
+      )
+      (?<suffix>\W)?                         # Suffix
+    }x.freeze
+
+    TYPES = %i(user issue label merge_request snippet commit commit_range).freeze
+
+    def parse_references(text, project = @project)
+      # parse reference links
+      text.gsub!(REFERENCE_PATTERN) do |match|
+        type = TYPES.detect { |t| $~[t].present? }
+
+        actual_project = project
+        project_prefix = nil
+        project_path = $LAST_MATCH_INFO[:project]
+        if project_path
+          actual_project = ::Project.find_with_namespace(project_path)
+          actual_project = nil unless can?(current_user, :read_project, actual_project)
+          project_prefix = project_path
+        end
+
+        parse_result($LAST_MATCH_INFO, type,
+                     actual_project, project_prefix) || match
+      end
+    end
+
+    # Called from #parse_references.  Attempts to build a gitlab reference
+    # link.  Returns nil if +type+ is nil, if the match string is an HTML
+    # entity, if the reference is invalid, or if the matched text includes an
+    # invalid project path.
+    def parse_result(match_info, type, project, project_prefix)
+      prefix = match_info[:prefix]
+      suffix = match_info[:suffix]
+
+      return nil if html_entity?(prefix, suffix) || type.nil?
+      return nil if project.nil? && !project_prefix.nil?
+
+      identifier = match_info[type]
+      ref_link = reference_link(type, identifier, project, project_prefix)
+
+      if ref_link
+        "#{prefix}#{ref_link}#{suffix}"
+      else
+        nil
+      end
+    end
+
+    # Return true if the +prefix+ and +suffix+ indicate that the matched string
+    # is an HTML entity like &amp;
+    def html_entity?(prefix, suffix)
+      prefix && suffix && prefix[0] == '&' && suffix[-1] == ';'
+    end
+
     def reference_link(type, identifier, project, _)
       references[type] << [project, identifier]
     end

From 34a23bda6064fcbba7bbeaf5f5bdba25abcfa041 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 13 Apr 2015 16:23:00 -0400
Subject: [PATCH 28/80] Add current_user to filter context

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

diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb
index 1babdc476bd..f2302015437 100644
--- a/lib/gitlab/markdown.rb
+++ b/lib/gitlab/markdown.rb
@@ -67,6 +67,7 @@ module Gitlab
         whitelist:       sanitization_whitelist,
         reference_class: html_options[:class],
         only_path:       options[:reference_only_path],
+        current_user:    current_user,
         project:         project
       }
 

From f76df89058e374db85b9fad416884b410d0ffd61 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 13 Apr 2015 18:00:46 -0400
Subject: [PATCH 29/80] Begin cleaning out
 spec/helpers/gitlab_markdown_helper_spec

---
 app/helpers/gitlab_markdown_helper.rb       |   1 +
 spec/helpers/gitlab_markdown_helper_spec.rb | 365 ++------------------
 2 files changed, 31 insertions(+), 335 deletions(-)

diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb
index aa1de2f50ef..aff7011edd0 100644
--- a/app/helpers/gitlab_markdown_helper.rb
+++ b/app/helpers/gitlab_markdown_helper.rb
@@ -74,6 +74,7 @@ module GitlabMarkdownHelper
     end
   end
 
+  # TODO (rspeicher): This should be its own filter
   def create_relative_links(text)
     paths = extract_paths(text)
 
diff --git a/spec/helpers/gitlab_markdown_helper_spec.rb b/spec/helpers/gitlab_markdown_helper_spec.rb
index 3454935078c..4451f34b28b 100644
--- a/spec/helpers/gitlab_markdown_helper_spec.rb
+++ b/spec/helpers/gitlab_markdown_helper_spec.rb
@@ -37,6 +37,7 @@ describe GitlabMarkdownHelper do
 
   describe "#gfm" do
     it "should return unaltered text if project is nil" do
+      skip "rspeicher - This isn't actually checked in this method anymore."
       actual = "Testing references: ##{issue.iid}"
 
       expect(gfm(actual)).not_to eq(actual)
@@ -46,11 +47,13 @@ describe GitlabMarkdownHelper do
     end
 
     it "should not alter non-references" do
+      skip "rspeicher - Invalid test: markdown has already been parsed by the time gfm gets it"
       actual = expected = "_Please_ *stop* 'helping' and all the other b*$#%' you do."
       expect(gfm(actual)).to eq(expected)
     end
 
     it "should not touch HTML entities" do
+      skip "rspeicher - Invalid test: Sanitize (or Nokogiri?) translates the HTML entity back"
       allow(@project).to receive(:issue_exists?).
         with(39).and_return([issue])
       actual = 'We&#39;ll accept good pull requests.'
@@ -62,341 +65,6 @@ describe GitlabMarkdownHelper do
           to have_selector('a.gfm.foo')
     end
 
-    describe "referencing a commit range" do
-      let(:expected) { namespace_project_compare_path(project.namespace, project, from: earlier_commit.id, to: commit.id) }
-
-      it "should link using a full id" do
-        actual = "What happened in #{earlier_commit.id}...#{commit.id}"
-        expect(gfm(actual)).to match(expected)
-      end
-
-      it "should link using a short id" do
-        actual = "What happened in #{earlier_commit.short_id}...#{commit.short_id}"
-        expected = namespace_project_compare_path(project.namespace, project, from: earlier_commit.short_id, to: commit.short_id)
-        expect(gfm(actual)).to match(expected)
-      end
-
-      it "should link inclusively" do
-        actual = "What happened in #{earlier_commit.id}..#{commit.id}"
-        expected = namespace_project_compare_path(project.namespace, project, from: "#{earlier_commit.id}^", to: commit.id)
-        expect(gfm(actual)).to match(expected)
-      end
-
-      it "should link with adjacent text" do
-        actual = "(see #{earlier_commit.id}...#{commit.id})"
-        expect(gfm(actual)).to match(expected)
-      end
-
-      it "should keep whitespace intact" do
-        actual   = "Changes #{earlier_commit.id}...#{commit.id} dramatically"
-        expected = /Changes <a.+>#{earlier_commit.id}...#{commit.id}<\/a> dramatically/
-        expect(gfm(actual)).to match(expected)
-      end
-
-      it "should not link with an invalid id" do
-        actual = expected = "What happened in #{earlier_commit.id.reverse}...#{commit.id.reverse}"
-        expect(gfm(actual)).to eq(expected)
-      end
-
-      it "should include a title attribute" do
-        actual = "What happened in #{earlier_commit.id}...#{commit.id}"
-        expect(gfm(actual)).to match(/title="Commits #{earlier_commit.id} through #{commit.id}"/)
-      end
-
-      it "should include standard gfm classes" do
-        actual = "What happened in #{earlier_commit.id}...#{commit.id}"
-        expect(gfm(actual)).to match(/class="\s?gfm gfm-commit_range\s?"/)
-      end
-    end
-
-    describe "referencing a commit" do
-      let(:expected) { namespace_project_commit_path(project.namespace, project, commit) }
-
-      it "should link using a full id" do
-        actual = "Reverts #{commit.id}"
-        expect(gfm(actual)).to match(expected)
-      end
-
-      it "should link using a short id" do
-        actual = "Backported from #{commit.short_id}"
-        expect(gfm(actual)).to match(expected)
-      end
-
-      it "should link with adjacent text" do
-        actual = "Reverted (see #{commit.id})"
-        expect(gfm(actual)).to match(expected)
-      end
-
-      it "should keep whitespace intact" do
-        actual   = "Changes #{commit.id} dramatically"
-        expected = /Changes <a.+>#{commit.id}<\/a> dramatically/
-        expect(gfm(actual)).to match(expected)
-      end
-
-      it "should not link with an invalid id" do
-        actual = expected = "What happened in #{commit.id.reverse}"
-        expect(gfm(actual)).to eq(expected)
-      end
-
-      it "should include a title attribute" do
-        actual = "Reverts #{commit.id}"
-        expect(gfm(actual)).to match(/title="#{commit.link_title}"/)
-      end
-
-      it "should include standard gfm classes" do
-        actual = "Reverts #{commit.id}"
-        expect(gfm(actual)).to match(/class="\s?gfm gfm-commit\s?"/)
-      end
-    end
-
-    describe "referencing a team member" do
-      let(:actual)   { "@#{user.username} you are right." }
-      let(:expected) { user_path(user) }
-
-      before do
-        project.team << [user, :master]
-      end
-
-      it "should link using a simple name" do
-        expect(gfm(actual)).to match(expected)
-      end
-
-      it "should link using a name with dots" do
-        user.update_attributes(name: "alphA.Beta")
-        expect(gfm(actual)).to match(expected)
-      end
-
-      it "should link using name with underscores" do
-        user.update_attributes(name: "ping_pong_king")
-        expect(gfm(actual)).to match(expected)
-      end
-
-      it "should link with adjacent text" do
-        actual = "Mail the admin (@#{user.username})"
-        expect(gfm(actual)).to match(expected)
-      end
-
-      it "should keep whitespace intact" do
-        actual   = "Yes, @#{user.username} is right."
-        expected = /Yes, <a.+>@#{user.username}<\/a> is right/
-        expect(gfm(actual)).to match(expected)
-      end
-
-      it "should not link with an invalid id" do
-        actual = expected = "@#{user.username.reverse} you are right."
-        expect(gfm(actual)).to eq(expected)
-      end
-
-      it "should include standard gfm classes" do
-        expect(gfm(actual)).to match(/class="\s?gfm gfm-project_member\s?"/)
-      end
-    end
-
-    # Shared examples for referencing an object
-    #
-    # Expects the following attributes to be available in the example group:
-    #
-    # - object    - The object itself
-    # - reference - The object reference string (e.g., #1234, $1234, !1234)
-    #
-    # Currently limited to Snippets, Issues and MergeRequests
-    shared_examples 'referenced object' do
-      let(:actual)   { "Reference to #{reference}" }
-      let(:expected) { polymorphic_path([project.namespace, project, object]) }
-
-      it "should link using a valid id" do
-        expect(gfm(actual)).to match(expected)
-      end
-
-      it "should link with adjacent text" do
-        # Wrap the reference in parenthesis
-        expect(gfm(actual.gsub(reference, "(#{reference})"))).to match(expected)
-
-        # Append some text to the end of the reference
-        expect(gfm(actual.gsub(reference, "#{reference}, right?"))).
-          to match(expected)
-      end
-
-      it "should keep whitespace intact" do
-        actual   = "Referenced #{reference} already."
-        expected = /Referenced <a.+>[^\s]+<\/a> already/
-        expect(gfm(actual)).to match(expected)
-      end
-
-      it "should not link with an invalid id" do
-        # Modify the reference string so it's still parsed, but is invalid
-        reference.gsub!(/^(.)(\d+)$/, '\1' + ('\2' * 2))
-        expect(gfm(actual)).to eq(actual)
-      end
-
-      it "should include a title attribute" do
-        title = "#{object.class.to_s.titlecase}: #{object.title}"
-        expect(gfm(actual)).to match(/title="#{title}"/)
-      end
-
-      it "should include standard gfm classes" do
-        css = object.class.to_s.underscore
-        expect(gfm(actual)).to match(/class="\s?gfm gfm-#{css}\s?"/)
-      end
-    end
-
-    # Shared examples for referencing an object in a different project
-    #
-    # Expects the following attributes to be available in the example group:
-    #
-    # - object    - The object itself
-    # - reference - The object reference string (e.g., #1234, $1234, !1234)
-    # - other_project - The project that owns the target object
-    #
-    # Currently limited to Snippets, Issues and MergeRequests
-    shared_examples 'cross-project referenced object' do
-      let(:project_path) { @other_project.path_with_namespace }
-      let(:full_reference) { "#{project_path}#{reference}" }
-      let(:actual)   { "Reference to #{full_reference}" }
-      let(:expected) do
-        if object.is_a?(Commit)
-          namespace_project_commit_path(@other_project.namespace, @other_project, object)
-        else
-          polymorphic_path([@other_project.namespace, @other_project, object])
-        end
-      end
-
-      it 'should link using a valid id' do
-        expect(gfm(actual)).to match(
-          /#{expected}.*#{Regexp.escape(full_reference)}/
-        )
-      end
-
-      it 'should link with adjacent text' do
-        # Wrap the reference in parenthesis
-        expect(gfm(actual.gsub(full_reference, "(#{full_reference})"))).to(
-          match(expected)
-        )
-
-        # Append some text to the end of the reference
-        expect(gfm(actual.gsub(full_reference, "#{full_reference}, right?"))).
-          to(match(expected))
-      end
-
-      it 'should keep whitespace intact' do
-        actual   = "Referenced #{full_reference} already."
-        expected = /Referenced <a.+>[^\s]+<\/a> already/
-        expect(gfm(actual)).to match(expected)
-      end
-
-      it 'should not link with an invalid id' do
-        # Modify the reference string so it's still parsed, but is invalid
-        if object.is_a?(Commit)
-          reference.gsub!(/^(.).+$/, '\1' + '12345abcd')
-        else
-          reference.gsub!(/^(.)(\d+)$/, '\1' + ('\2' * 2))
-        end
-        expect(gfm(actual)).to eq(actual)
-      end
-
-      it 'should include a title attribute' do
-        if object.is_a?(Commit)
-          title = object.link_title
-        else
-          title = "#{object.class.to_s.titlecase}: #{object.title}"
-        end
-        expect(gfm(actual)).to match(/title="#{title}"/)
-      end
-
-      it 'should include standard gfm classes' do
-        css = object.class.to_s.underscore
-        expect(gfm(actual)).to match(/class="\s?gfm gfm-#{css}\s?"/)
-      end
-    end
-
-    describe "referencing an issue" do
-      let(:object)    { issue }
-      let(:reference) { "##{issue.iid}" }
-
-      include_examples 'referenced object'
-    end
-
-    context 'cross-repo references' do
-      before(:all) do
-        @other_project = create(:project, :public)
-        @commit2 = @other_project.repository.commit
-        @issue2 = create(:issue, project: @other_project)
-        @merge_request2 = create(:merge_request,
-                                 source_project: @other_project,
-                                 target_project: @other_project)
-      end
-
-      describe 'referencing an issue in another project' do
-        let(:object)    { @issue2 }
-        let(:reference) { "##{@issue2.iid}" }
-
-        include_examples 'cross-project referenced object'
-      end
-
-      describe 'referencing an merge request in another project' do
-        let(:object)    { @merge_request2 }
-        let(:reference) { "!#{@merge_request2.iid}" }
-
-        include_examples 'cross-project referenced object'
-      end
-
-      describe 'referencing a commit in another project' do
-        let(:object)    { @commit2 }
-        let(:reference) { "@#{@commit2.id}" }
-
-        include_examples 'cross-project referenced object'
-      end
-    end
-
-    describe "referencing a merge request" do
-      let(:object)    { merge_request }
-      let(:reference) { "!#{merge_request.iid}" }
-
-      include_examples 'referenced object'
-    end
-
-    describe "referencing a snippet" do
-      let(:object)    { snippet }
-      let(:reference) { "$#{snippet.id}" }
-      let(:actual)   { "Reference to #{reference}" }
-      let(:expected) { namespace_project_snippet_path(project.namespace, project, object) }
-
-      it "should link using a valid id" do
-        expect(gfm(actual)).to match(expected)
-      end
-
-      it "should link with adjacent text" do
-        # Wrap the reference in parenthesis
-        expect(gfm(actual.gsub(reference, "(#{reference})"))).to match(expected)
-
-        # Append some text to the end of the reference
-        expect(gfm(actual.gsub(reference, "#{reference}, right?"))).to match(expected)
-      end
-
-      it "should keep whitespace intact" do
-        actual   = "Referenced #{reference} already."
-        expected = /Referenced <a.+>[^\s]+<\/a> already/
-        expect(gfm(actual)).to match(expected)
-      end
-
-      it "should not link with an invalid id" do
-        # Modify the reference string so it's still parsed, but is invalid
-        reference.gsub!(/^(.)(\d+)$/, '\1' + ('\2' * 2))
-        expect(gfm(actual)).to eq(actual)
-      end
-
-      it "should include a title attribute" do
-        title = "Snippet: #{object.title}"
-        expect(gfm(actual)).to match(/title="#{title}"/)
-      end
-
-      it "should include standard gfm classes" do
-        css = object.class.to_s.underscore
-        expect(gfm(actual)).to match(/class="\s?gfm gfm-snippet\s?"/)
-      end
-
-    end
-
     describe "referencing multiple objects" do
       let(:actual) { "!#{merge_request.iid} -> #{commit.id} -> ##{issue.iid}" }
 
@@ -416,6 +84,7 @@ describe GitlabMarkdownHelper do
       end
     end
 
+    # TODO (rspeicher): These tests belong in the emoji filter spec
     describe "emoji" do
       it "matches at the start of a string" do
         expect(gfm(":+1:")).to match(/<img/)
@@ -510,11 +179,15 @@ describe GitlabMarkdownHelper do
   end
 
   describe "#markdown" do
+    # TODO (rspeicher) - This block tests multiple different contexts. Break this up!
+
     it "should handle references in paragraphs" do
+      skip "rspeicher - redundant"
       actual = "\n\nLorem ipsum dolor sit amet. #{commit.id} Nam pulvinar sapien eget.\n"
       expected = namespace_project_commit_path(project.namespace, project, commit)
       expect(markdown(actual)).to match(expected)
     end
+    # REFERENCES (PART TWO: THE REVENGE) ---------------------------------------
 
     it "should handle references in headers" do
       actual = "\n# Working around ##{issue.iid}\n## Apply !#{merge_request.iid}"
@@ -541,6 +214,7 @@ describe GitlabMarkdownHelper do
     end
 
     it "should handle references in lists" do
+      skip "rspeicher - redundant"
       project.team << [user, :master]
 
       actual = "\n* dark: ##{issue.iid}\n* light by @#{member.user.username}"
@@ -552,6 +226,8 @@ describe GitlabMarkdownHelper do
     end
 
     it "should not link the apostrophe to issue 39" do
+      skip "rspeicher - Redundant"
+
       project.team << [user, :master]
       allow(project.issues).
         to receive(:where).with(iid: '39').and_return([issue])
@@ -562,6 +238,8 @@ describe GitlabMarkdownHelper do
     end
 
     it "should not link the apostrophe to issue 39 in code blocks" do
+      skip "rspeicher - Redundant"
+
       project.team << [user, :master]
       allow(project.issues).
         to receive(:where).with(iid: '39').and_return([issue])
@@ -579,6 +257,8 @@ describe GitlabMarkdownHelper do
     end
 
     it "should handle tables" do
+      skip "rspeicher - Aren't we just testing Redcarpet here?"
+
       actual = %Q{| header 1 | header 2 |
 | -------- | -------- |
 | cell 1   | cell 2   |
@@ -587,6 +267,8 @@ describe GitlabMarkdownHelper do
       expect(markdown(actual)).to match(/\A<table/)
     end
 
+    # CODE BLOCKS -------------------------------------------------------------
+
     it "should leave code blocks untouched" do
       allow(helper).to receive(:user_color_scheme_class).and_return(:white)
 
@@ -604,6 +286,9 @@ describe GitlabMarkdownHelper do
       )
     end
 
+    # REF-LIKE AUTOLINKS? -----------------------------------------------------
+    # Basically: Don't parse references inside `<a>` tags.
+
     it "should leave ref-like autolinks untouched" do
       expect(markdown("look at http://example.tld/#!#{merge_request.iid}")).to eq("<p>look at <a href=\"http://example.tld/#!#{merge_request.iid}\">http://example.tld/#!#{merge_request.iid}</a></p>\n")
     end
@@ -620,23 +305,30 @@ describe GitlabMarkdownHelper do
       expect(markdown("##{issue.iid}")).to include(namespace_project_issue_path(project.namespace, project, issue))
     end
 
+    # EMOJI -------------------------------------------------------------------
+
     it "should generate absolute urls for emoji" do
+      # TODO (rspeicher): Why isn't this with the emoji tests?
       expect(markdown(':smile:')).to(
         include(%(src="#{Gitlab.config.gitlab.url}/assets/emoji/#{Emoji.emoji_filename('smile')}.png))
       )
     end
 
     it "should generate absolute urls for emoji if relative url is present" do
+      # TODO (rspeicher): Why isn't this with the emoji tests?
       allow(Gitlab.config.gitlab).to receive(:url).and_return('http://localhost/gitlab/root')
       expect(markdown(":smile:")).to include("src=\"http://localhost/gitlab/root/assets/emoji/#{Emoji.emoji_filename('smile')}.png")
     end
 
     it "should generate absolute urls for emoji if asset_host is present" do
+      # TODO (rspeicher): Why isn't this with the emoji tests?
       allow(Gitlab::Application.config).to receive(:asset_host).and_return("https://cdn.example.com")
       ActionView::Base.any_instance.stub_chain(:config, :asset_host).and_return("https://cdn.example.com")
       expect(markdown(":smile:")).to include("src=\"https://cdn.example.com/assets/emoji/#{Emoji.emoji_filename('smile')}.png")
     end
 
+    # RELATIVE URLS -----------------------------------------------------------
+    # TODO (rspeicher): These belong in a relative link filter spec
 
     it "should handle relative urls for a file in master" do
       actual = "[GitLab API doc](doc/api/README.md)\n"
@@ -691,6 +383,8 @@ describe GitlabMarkdownHelper do
       expect(markdown(actual)).to match(actual)
     end
 
+    # SANITIZATION ------------------------------------------------------------
+
     it 'should sanitize tags that are not whitelisted' do
       actual = '<textarea>no inputs allowed</textarea> <blink>no blinks</blink>'
       expected = 'no inputs allowed no blinks'
@@ -717,6 +411,7 @@ describe GitlabMarkdownHelper do
     end
   end
 
+  # TODO (rspeicher): This should be a context of relative link specs, not its own thing
   describe 'markdown for empty repository' do
     before do
       @project = empty_project

From b41eb345034ee450bf7a5b9f3d608a89b28c7a84 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 13 Apr 2015 18:05:42 -0400
Subject: [PATCH 30/80] Re-arrange spec/helpers/gitlab_markdown_helper_spec a
 bit

---
 spec/helpers/gitlab_markdown_helper_spec.rb | 222 ++++++++++----------
 1 file changed, 111 insertions(+), 111 deletions(-)

diff --git a/spec/helpers/gitlab_markdown_helper_spec.rb b/spec/helpers/gitlab_markdown_helper_spec.rb
index 4451f34b28b..6a2ddf717a6 100644
--- a/spec/helpers/gitlab_markdown_helper_spec.rb
+++ b/spec/helpers/gitlab_markdown_helper_spec.rb
@@ -130,6 +130,116 @@ describe GitlabMarkdownHelper do
         expect(gfm(":+1:")).to match(/<img/)
       end
     end
+
+    context 'parse_tasks: true' do
+      before(:all) do
+        @source_text_asterisk = <<-EOT.strip_heredoc
+          * [ ] valid unchecked task
+          * [x] valid lowercase checked task
+          * [X] valid uppercase checked task
+              * [ ] valid unchecked nested task
+              * [x] valid checked nested task
+
+          [ ] not an unchecked task - no list item
+          [x] not a checked task - no list item
+
+          * [  ] not an unchecked task - too many spaces
+          * [x ] not a checked task - too many spaces
+          * [] not an unchecked task - no spaces
+          * Not a task [ ] - not at beginning
+        EOT
+
+        @source_text_dash = <<-EOT.strip_heredoc
+          - [ ] valid unchecked task
+          - [x] valid lowercase checked task
+          - [X] valid uppercase checked task
+              - [ ] valid unchecked nested task
+              - [x] valid checked nested task
+        EOT
+      end
+
+      it 'should render checkboxes at beginning of asterisk list items' do
+        rendered_text = markdown(@source_text_asterisk, parse_tasks: true)
+
+        expect(rendered_text).to match(/<input.*checkbox.*valid unchecked task/)
+        expect(rendered_text).to match(
+          /<input.*checkbox.*valid lowercase checked task/
+        )
+        expect(rendered_text).to match(
+          /<input.*checkbox.*valid uppercase checked task/
+        )
+      end
+
+      it 'should render checkboxes at beginning of dash list items' do
+        rendered_text = markdown(@source_text_dash, parse_tasks: true)
+
+        expect(rendered_text).to match(/<input.*checkbox.*valid unchecked task/)
+        expect(rendered_text).to match(
+          /<input.*checkbox.*valid lowercase checked task/
+        )
+        expect(rendered_text).to match(
+          /<input.*checkbox.*valid uppercase checked task/
+        )
+      end
+
+      it 'should render checkboxes for nested tasks' do
+        rendered_text = markdown(@source_text_asterisk, parse_tasks: true)
+
+        expect(rendered_text).to match(
+          /<input.*checkbox.*valid unchecked nested task/
+        )
+        expect(rendered_text).to match(
+          /<input.*checkbox.*valid checked nested task/
+        )
+      end
+
+      it 'should not be confused by whitespace before bullets' do
+        rendered_text_asterisk = markdown(@source_text_asterisk,
+                                          parse_tasks: true)
+        rendered_text_dash = markdown(@source_text_dash, parse_tasks: true)
+
+        expect(rendered_text_asterisk).to match(
+          /<input.*checkbox.*valid unchecked nested task/
+        )
+        expect(rendered_text_asterisk).to match(
+          /<input.*checkbox.*valid checked nested task/
+        )
+        expect(rendered_text_dash).to match(
+          /<input.*checkbox.*valid unchecked nested task/
+        )
+        expect(rendered_text_dash).to match(
+          /<input.*checkbox.*valid checked nested task/
+        )
+      end
+
+      it 'should not render checkboxes outside of list items' do
+        rendered_text = markdown(@source_text_asterisk, parse_tasks: true)
+
+        expect(rendered_text).not_to match(
+          /<input.*checkbox.*not an unchecked task - no list item/
+        )
+        expect(rendered_text).not_to match(
+          /<input.*checkbox.*not a checked task - no list item/
+        )
+      end
+
+      it 'should not render checkboxes with invalid formatting' do
+        rendered_text = markdown(@source_text_asterisk, parse_tasks: true)
+
+        expect(rendered_text).not_to match(
+          /<input.*checkbox.*not an unchecked task - too many spaces/
+        )
+        expect(rendered_text).not_to match(
+          /<input.*checkbox.*not a checked task - too many spaces/
+        )
+        expect(rendered_text).not_to match(
+          /<input.*checkbox.*not an unchecked task - no spaces/
+        )
+        expect(rendered_text).not_to match(
+          /Not a task.*<input.*checkbox.*not at beginning/
+        )
+      end
+    end
   end
 
   describe "#link_to_gfm" do
@@ -425,7 +535,7 @@ describe GitlabMarkdownHelper do
     end
   end
 
-  describe "#render_wiki_content" do
+  describe '#render_wiki_content' do
     before do
       @wiki = double('WikiPage')
       allow(@wiki).to receive(:content).and_return('wiki content')
@@ -448,114 +558,4 @@ describe GitlabMarkdownHelper do
       helper.render_wiki_content(@wiki)
     end
   end
-
-  describe '#gfm_with_tasks' do
-    before(:all) do
-      @source_text_asterisk = <<EOT.gsub(/^\s{8}/, '')
-        * [ ] valid unchecked task
-        * [x] valid lowercase checked task
-        * [X] valid uppercase checked task
-            * [ ] valid unchecked nested task
-            * [x] valid checked nested task
-
-        [ ] not an unchecked task - no list item
-        [x] not a checked task - no list item
-
-        * [  ] not an unchecked task - too many spaces
-        * [x ] not a checked task - too many spaces
-        * [] not an unchecked task - no spaces
-        * Not a task [ ] - not at beginning
-EOT
-
-      @source_text_dash = <<EOT.gsub(/^\s{8}/, '')
-        - [ ] valid unchecked task
-        - [x] valid lowercase checked task
-        - [X] valid uppercase checked task
-            - [ ] valid unchecked nested task
-            - [x] valid checked nested task
-EOT
-    end
-
-    it 'should render checkboxes at beginning of asterisk list items' do
-      rendered_text = markdown(@source_text_asterisk, parse_tasks: true)
-
-      expect(rendered_text).to match(/<input.*checkbox.*valid unchecked task/)
-      expect(rendered_text).to match(
-        /<input.*checkbox.*valid lowercase checked task/
-      )
-      expect(rendered_text).to match(
-        /<input.*checkbox.*valid uppercase checked task/
-      )
-    end
-
-    it 'should render checkboxes at beginning of dash list items' do
-      rendered_text = markdown(@source_text_dash, parse_tasks: true)
-
-      expect(rendered_text).to match(/<input.*checkbox.*valid unchecked task/)
-      expect(rendered_text).to match(
-        /<input.*checkbox.*valid lowercase checked task/
-      )
-      expect(rendered_text).to match(
-        /<input.*checkbox.*valid uppercase checked task/
-      )
-    end
-
-    it 'should render checkboxes for nested tasks' do
-      rendered_text = markdown(@source_text_asterisk, parse_tasks: true)
-
-      expect(rendered_text).to match(
-        /<input.*checkbox.*valid unchecked nested task/
-      )
-      expect(rendered_text).to match(
-        /<input.*checkbox.*valid checked nested task/
-      )
-    end
-
-    it 'should not be confused by whitespace before bullets' do
-      rendered_text_asterisk = markdown(@source_text_asterisk,
-                                        parse_tasks: true)
-      rendered_text_dash = markdown(@source_text_dash, parse_tasks: true)
-
-      expect(rendered_text_asterisk).to match(
-        /<input.*checkbox.*valid unchecked nested task/
-      )
-      expect(rendered_text_asterisk).to match(
-        /<input.*checkbox.*valid checked nested task/
-      )
-      expect(rendered_text_dash).to match(
-        /<input.*checkbox.*valid unchecked nested task/
-      )
-      expect(rendered_text_dash).to match(
-        /<input.*checkbox.*valid checked nested task/
-      )
-    end
-
-    it 'should not render checkboxes outside of list items' do
-      rendered_text = markdown(@source_text_asterisk, parse_tasks: true)
-
-      expect(rendered_text).not_to match(
-        /<input.*checkbox.*not an unchecked task - no list item/
-      )
-      expect(rendered_text).not_to match(
-        /<input.*checkbox.*not a checked task - no list item/
-      )
-    end
-
-    it 'should not render checkboxes with invalid formatting' do
-      rendered_text = markdown(@source_text_asterisk, parse_tasks: true)
-
-      expect(rendered_text).not_to match(
-        /<input.*checkbox.*not an unchecked task - too many spaces/
-      )
-      expect(rendered_text).not_to match(
-        /<input.*checkbox.*not a checked task - too many spaces/
-      )
-      expect(rendered_text).not_to match(
-        /<input.*checkbox.*not an unchecked task - no spaces/
-      )
-      expect(rendered_text).not_to match(
-        /Not a task.*<input.*checkbox.*not at beginning/
-      )
-    end
-  end
 end

From 4d3a634ece99b95d45c356a470ca665b49d0c2c1 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 13 Apr 2015 18:10:49 -0400
Subject: [PATCH 31/80] Fix broken spec

---
 spec/helpers/gitlab_markdown_helper_spec.rb | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/spec/helpers/gitlab_markdown_helper_spec.rb b/spec/helpers/gitlab_markdown_helper_spec.rb
index 6a2ddf717a6..1f490ba2344 100644
--- a/spec/helpers/gitlab_markdown_helper_spec.rb
+++ b/spec/helpers/gitlab_markdown_helper_spec.rb
@@ -366,20 +366,10 @@ describe GitlabMarkdownHelper do
         to match(%r{Apply <em><a.+>!#{merge_request.iid}</a></em>})
     end
 
-    it "should handle tables" do
-      skip "rspeicher - Aren't we just testing Redcarpet here?"
-
-      actual = %Q{| header 1 | header 2 |
-| -------- | -------- |
-| cell 1   | cell 2   |
-| cell 3   | cell 4   |}
-
-      expect(markdown(actual)).to match(/\A<table/)
-    end
-
     # CODE BLOCKS -------------------------------------------------------------
 
     it "should leave code blocks untouched" do
+      allow(helper).to receive(:current_user).and_return(user)
       allow(helper).to receive(:user_color_scheme_class).and_return(:white)
 
       target_html = "<pre class=\"code highlight white plaintext\"><code>some code from $#{snippet.id}\nhere too\n</code></pre>\n"

From 470b0c2508e792e93a9e7db7ba605475edfa2de4 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 13 Apr 2015 18:14:29 -0400
Subject: [PATCH 32/80] Remove more now-invalid specs

---
 spec/helpers/gitlab_markdown_helper_spec.rb | 66 ---------------------
 1 file changed, 66 deletions(-)

diff --git a/spec/helpers/gitlab_markdown_helper_spec.rb b/spec/helpers/gitlab_markdown_helper_spec.rb
index 1f490ba2344..315e91d4f35 100644
--- a/spec/helpers/gitlab_markdown_helper_spec.rb
+++ b/spec/helpers/gitlab_markdown_helper_spec.rb
@@ -36,30 +36,6 @@ describe GitlabMarkdownHelper do
   end
 
   describe "#gfm" do
-    it "should return unaltered text if project is nil" do
-      skip "rspeicher - This isn't actually checked in this method anymore."
-      actual = "Testing references: ##{issue.iid}"
-
-      expect(gfm(actual)).not_to eq(actual)
-
-      @project = nil
-      expect(gfm(actual)).to eq(actual)
-    end
-
-    it "should not alter non-references" do
-      skip "rspeicher - Invalid test: markdown has already been parsed by the time gfm gets it"
-      actual = expected = "_Please_ *stop* 'helping' and all the other b*$#%' you do."
-      expect(gfm(actual)).to eq(expected)
-    end
-
-    it "should not touch HTML entities" do
-      skip "rspeicher - Invalid test: Sanitize (or Nokogiri?) translates the HTML entity back"
-      allow(@project).to receive(:issue_exists?).
-        with(39).and_return([issue])
-      actual = 'We&#39;ll accept good pull requests.'
-      expect(gfm(actual)).to eq("We'll accept good pull requests.")
-    end
-
     it "should forward HTML options to links" do
       expect(gfm("Fixed in #{commit.id}", @project, class: 'foo')).
           to have_selector('a.gfm.foo')
@@ -291,12 +267,6 @@ describe GitlabMarkdownHelper do
   describe "#markdown" do
     # TODO (rspeicher) - This block tests multiple different contexts. Break this up!
 
-    it "should handle references in paragraphs" do
-      skip "rspeicher - redundant"
-      actual = "\n\nLorem ipsum dolor sit amet. #{commit.id} Nam pulvinar sapien eget.\n"
-      expected = namespace_project_commit_path(project.namespace, project, commit)
-      expect(markdown(actual)).to match(expected)
-    end
     # REFERENCES (PART TWO: THE REVENGE) ---------------------------------------
 
     it "should handle references in headers" do
@@ -323,42 +293,6 @@ describe GitlabMarkdownHelper do
       )
     end
 
-    it "should handle references in lists" do
-      skip "rspeicher - redundant"
-      project.team << [user, :master]
-
-      actual = "\n* dark: ##{issue.iid}\n* light by @#{member.user.username}"
-
-      expect(markdown(actual)).
-        to match(%r{<li>dark: <a.+>##{issue.iid}</a></li>})
-      expect(markdown(actual)).
-        to match(%r{<li>light by <a.+>@#{member.user.username}</a></li>})
-    end
-
-    it "should not link the apostrophe to issue 39" do
-      skip "rspeicher - Redundant"
-
-      project.team << [user, :master]
-      allow(project.issues).
-        to receive(:where).with(iid: '39').and_return([issue])
-
-      actual   = "Yes, it is @#{member.user.username}'s task."
-      expected = /Yes, it is <a.+>@#{member.user.username}<\/a>'s task/
-      expect(markdown(actual)).to match(expected)
-    end
-
-    it "should not link the apostrophe to issue 39 in code blocks" do
-      skip "rspeicher - Redundant"
-
-      project.team << [user, :master]
-      allow(project.issues).
-        to receive(:where).with(iid: '39').and_return([issue])
-
-      actual   = "Yes, `it is @#{member.user.username}'s task.`"
-      expected = /Yes, <code>it is @gfm\'s task.<\/code>/
-      expect(markdown(actual)).to match(expected)
-    end
-
     it "should handle references in <em>" do
       actual = "Apply _!#{merge_request.iid}_ ASAP"
 

From a803cd51eb3c5b98b14eeea56ec4cc363823c2c2 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Tue, 14 Apr 2015 16:04:37 -0400
Subject: [PATCH 33/80] Check for project read permissions in cross-references

---
 .../markdown/cross_project_reference.rb       | 16 +++++--
 .../markdown/cross_project_reference_spec.rb  | 47 +++++++++++++++----
 2 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/lib/gitlab/markdown/cross_project_reference.rb b/lib/gitlab/markdown/cross_project_reference.rb
index 114247d0a33..b2197432caa 100644
--- a/lib/gitlab/markdown/cross_project_reference.rb
+++ b/lib/gitlab/markdown/cross_project_reference.rb
@@ -8,19 +8,29 @@ module Gitlab
 
       # Given a cross-project reference string, get the Project record
       #
-      # If no valid reference is given, returns the `:project` value for the
-      # current context.
+      # Defaults to value of `context[:project]` if:
+      # - No reference is given
+      # - Reference given doesn't exist
+      # - Reference given can't be read by the current user
       #
       # ref - String reference.
       #
       # Returns a Project
       def project_from_ref(ref)
         if ref && other = Project.find_with_namespace(ref)
-          other
+          if user_can_reference_project?(other)
+            other
+          else
+            context[:project]
+          end
         else
           context[:project]
         end
       end
+
+      def user_can_reference_project?(project, user = context[:current_user])
+        user && Ability.abilities.allowed?(user, :read_project, project)
+      end
     end
   end
 end
diff --git a/spec/lib/gitlab/markdown/cross_project_reference_spec.rb b/spec/lib/gitlab/markdown/cross_project_reference_spec.rb
index 2a3814c8499..0632c1c71e9 100644
--- a/spec/lib/gitlab/markdown/cross_project_reference_spec.rb
+++ b/spec/lib/gitlab/markdown/cross_project_reference_spec.rb
@@ -2,21 +2,48 @@ require 'spec_helper'
 
 module Gitlab::Markdown
   describe CrossProjectReference do
-    include CrossProjectReference
+    # context in the html-pipeline sense, not in the rspec sense
+    let(:context) do
+      {
+        current_user: double('user'),
+        project: double('project')
+      }
+    end
+
+    include described_class
 
     describe '#project_from_ref' do
-      let(:project) { double('project') }
-
-      it 'returns a project from a valid reference' do
-        expect(Project).to receive(:find_with_namespace).with('cross-reference/foo').and_return(project)
-
-        expect(project_from_ref('cross-reference/foo')).to eq project
+      context 'when referenced project does not exist' do
+        it 'returns the project from context' do
+          expect(project_from_ref('invalid/reference')).to eq context[:project]
+        end
       end
 
-      it 'returns the project from context when reference is invalid' do
-        expect(self).to receive(:context).and_return({project: project})
+      context 'when referenced project exists' do
+        let(:project2) { double('referenced project') }
 
-        expect(project_from_ref('invalid/reference')).to eq project
+        before do
+          expect(Project).to receive(:find_with_namespace).
+            with('cross/reference').and_return(project2)
+        end
+
+        context 'and the user has permission to read it' do
+          it 'returns the referenced project' do
+            expect(self).to receive(:user_can_reference_project?).
+              with(project2).and_return(true)
+
+            expect(project_from_ref('cross/reference')).to eq project2
+          end
+        end
+
+        context 'and the user does not have permission to read it' do
+          it 'returns the project from context' do
+            expect(self).to receive(:user_can_reference_project?).
+              with(project2).and_return(false)
+
+            expect(project_from_ref('cross/reference')).to eq context[:project]
+          end
+        end
       end
     end
   end

From 62282971e0e8177eca7bea8c301cddb09ce6f441 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Tue, 14 Apr 2015 16:31:40 -0400
Subject: [PATCH 34/80] Rename `user_can_read_group?` to
 `user_can_reference_group?`

---
 lib/gitlab/markdown/user_reference_filter.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/gitlab/markdown/user_reference_filter.rb b/lib/gitlab/markdown/user_reference_filter.rb
index d6798ee2158..fd677613dc1 100644
--- a/lib/gitlab/markdown/user_reference_filter.rb
+++ b/lib/gitlab/markdown/user_reference_filter.rb
@@ -78,7 +78,7 @@ module Gitlab
             %(<a href="#{url}" class="#{klass}">@#{user}</a>)
           elsif namespace = Namespace.find_by(path: user)
             if namespace.is_a?(Group)
-              if user_can_read_group?(namespace)
+              if user_can_reference_group?(namespace)
                 url = group_url(user, only_path: context[:only_path])
                 %(<a href="#{url}" class="#{klass}">@#{user}</a>)
               else
@@ -117,7 +117,7 @@ module Gitlab
                                 only_path: context[:only_path])
       end
 
-      def user_can_read_group?(group)
+      def user_can_reference_group?(group)
         return false if context[:current_user].blank?
         Ability.abilities.allowed?(context[:current_user], :read_group, group)
       end

From b0ea7b3b3dd3be2d8ce0c0f53a64bcd01f8b2118 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Tue, 14 Apr 2015 16:32:28 -0400
Subject: [PATCH 35/80] Fix cross-project reference specs for new permission
 check

For simplicity's sake, since we're testing the actual referencing, we
just force the permission check to always be allowed.
---
 .../gitlab/markdown/commit_range_reference_filter_spec.rb    | 5 +++++
 spec/lib/gitlab/markdown/commit_reference_filter_spec.rb     | 5 +++++
 spec/lib/gitlab/markdown/issue_reference_filter_spec.rb      | 5 +++++
 .../gitlab/markdown/merge_request_reference_filter_spec.rb   | 5 +++++
 spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb    | 5 +++++
 5 files changed, 25 insertions(+)

diff --git a/spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb b/spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
index 67de23014f8..16597ff6859 100644
--- a/spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
@@ -90,6 +90,11 @@ module Gitlab::Markdown
       let(:commit2)   { project.repository.commit("HEAD~2") }
       let(:reference) { "#{project2.path_with_namespace}@#{commit1.id}...#{commit2.id}" }
 
+      before do
+        allow_any_instance_of(described_class).
+          to receive(:user_can_reference_project?).and_return(true)
+      end
+
       it 'links to a valid reference' do
         doc = filter("See #{reference}")
 
diff --git a/spec/lib/gitlab/markdown/commit_reference_filter_spec.rb b/spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
index f72953fd84e..84f773669f2 100644
--- a/spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
@@ -76,6 +76,11 @@ module Gitlab::Markdown
       let(:commit)    { project.repository.commit }
       let(:reference) { "#{project2.path_with_namespace}@#{commit.id}" }
 
+      before do
+        allow_any_instance_of(described_class).
+          to receive(:user_can_reference_project?).and_return(true)
+      end
+
       it 'links to a valid reference' do
         doc = filter("See #{reference}")
 
diff --git a/spec/lib/gitlab/markdown/issue_reference_filter_spec.rb b/spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
index 75b3fccf325..e4a0d4c70e2 100644
--- a/spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
@@ -82,6 +82,11 @@ module Gitlab::Markdown
       let(:issue)     { create(:issue, project: project2) }
       let(:reference) { "#{project2.path_with_namespace}##{issue.iid}" }
 
+      before do
+        allow_any_instance_of(described_class).
+          to receive(:user_can_reference_project?).and_return(true)
+      end
+
       it 'links to a valid reference' do
         doc = filter("See #{reference}")
 
diff --git a/spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb b/spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb
index 17bb50b157b..c3026edbf89 100644
--- a/spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb
@@ -70,6 +70,11 @@ module Gitlab::Markdown
       let(:merge)     { create(:merge_request, source_project: project2) }
       let(:reference) { "#{project2.path_with_namespace}!#{merge.iid}" }
 
+      before do
+        allow_any_instance_of(described_class).
+          to receive(:user_can_reference_project?).and_return(true)
+      end
+
       it 'links to a valid reference' do
         doc = filter("See #{reference}")
 
diff --git a/spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb b/spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
index a3285998ac1..3d30cacb0b1 100644
--- a/spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
@@ -69,6 +69,11 @@ module Gitlab::Markdown
       let(:snippet)   { create(:project_snippet, project: project2) }
       let(:reference) { "#{project2.path_with_namespace}$#{snippet.id}" }
 
+      before do
+        allow_any_instance_of(described_class).
+          to receive(:user_can_reference_project?).and_return(true)
+      end
+
       it 'links to a valid reference' do
         doc = filter("See #{reference}")
 

From 52909f8bdba4673cc87f7729f05f1b7fb19074c8 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Tue, 14 Apr 2015 17:32:51 -0400
Subject: [PATCH 36/80] Add permission check to ReferenceExtractor's user
 mentions

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

diff --git a/lib/gitlab/reference_extractor.rb b/lib/gitlab/reference_extractor.rb
index 64e8a650107..34aae384355 100644
--- a/lib/gitlab/reference_extractor.rb
+++ b/lib/gitlab/reference_extractor.rb
@@ -32,7 +32,7 @@ module Gitlab
           project.team.members.flatten
         elsif namespace = Namespace.find_by(path: identifier)
           if namespace.is_a?(Group)
-            namespace.users
+            namespace.users if can?(current_user, :read_group, namespace)
           else
             namespace.owner
           end

From c4eb6a55f14bfbe457be459092dff83207a27ac0 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Tue, 14 Apr 2015 17:33:44 -0400
Subject: [PATCH 37/80] Fix `user_can_reference_group?` check

---
 lib/gitlab/markdown/user_reference_filter.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/gitlab/markdown/user_reference_filter.rb b/lib/gitlab/markdown/user_reference_filter.rb
index fd677613dc1..3ac82041ff4 100644
--- a/lib/gitlab/markdown/user_reference_filter.rb
+++ b/lib/gitlab/markdown/user_reference_filter.rb
@@ -118,7 +118,6 @@ module Gitlab
       end
 
       def user_can_reference_group?(group)
-        return false if context[:current_user].blank?
         Ability.abilities.allowed?(context[:current_user], :read_group, group)
       end
     end

From 6189b24fddae66e1c2bb71c496301ff85701cb90 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Tue, 14 Apr 2015 18:07:21 -0400
Subject: [PATCH 38/80] Add a ReferenceFilter base class

This will allow for the removal of a lot of duplication from the
reference filters.
---
 lib/gitlab/markdown/reference_filter.rb | 68 +++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 lib/gitlab/markdown/reference_filter.rb

diff --git a/lib/gitlab/markdown/reference_filter.rb b/lib/gitlab/markdown/reference_filter.rb
new file mode 100644
index 00000000000..55cb6a4e6bc
--- /dev/null
+++ b/lib/gitlab/markdown/reference_filter.rb
@@ -0,0 +1,68 @@
+require 'html/pipeline'
+
+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 when reference is
+    #                         cross-project.
+    #   :reference_class    - Custom CSS class added to reference links.
+    #   :only_path          - Generate path-only links.
+    #
+    class ReferenceFilter < HTML::Pipeline::Filter
+      # Don't look for references in text nodes that are children of these
+      # elements.
+      IGNORE_PARENTS = %w(pre code a style).to_set
+
+      def ignored_ancestry?(node)
+        has_ancestor?(node, IGNORE_PARENTS)
+      end
+
+      def project
+        context[:project]
+      end
+
+      def reference_class(type)
+        "gfm gfm-#{type} #{context[:reference_class]}".strip
+      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::Document object.
+      def replace_text_nodes_matching(pattern)
+        doc.search('text()').each do |node|
+          content = node.to_html
+
+          next if project.nil?
+          next unless content.match(pattern)
+          next if ignored_ancestry?(node)
+
+          html = yield content
+
+          next if html == content
+
+          node.replace(html)
+        end
+
+        doc
+      end
+
+      def validate
+        needs :project
+      end
+    end
+  end
+end

From b3b8fc6c8a559b743d98577d07bc45a884e242a3 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Tue, 14 Apr 2015 18:34:01 -0400
Subject: [PATCH 39/80] DRY up reference filters using ReferenceFilter base
 class

---
 .../markdown/commit_range_reference_filter.rb | 44 ++------------
 .../markdown/commit_reference_filter.rb       | 44 ++------------
 .../markdown/cross_project_reference.rb       | 10 ++--
 .../external_issue_reference_filter.rb        | 44 ++------------
 lib/gitlab/markdown/issue_reference_filter.rb | 48 ++-------------
 lib/gitlab/markdown/label_reference_filter.rb | 43 ++------------
 .../merge_request_reference_filter.rb         | 40 ++-----------
 lib/gitlab/markdown/reference_filter.rb       |  3 +-
 .../markdown/snippet_reference_filter.rb      | 40 ++-----------
 lib/gitlab/markdown/user_reference_filter.rb  | 59 ++++---------------
 10 files changed, 55 insertions(+), 320 deletions(-)

diff --git a/lib/gitlab/markdown/commit_range_reference_filter.rb b/lib/gitlab/markdown/commit_range_reference_filter.rb
index 0d93bf4f280..ff85be8cb84 100644
--- a/lib/gitlab/markdown/commit_range_reference_filter.rb
+++ b/lib/gitlab/markdown/commit_range_reference_filter.rb
@@ -1,19 +1,9 @@
-require 'html/pipeline'
-
 module Gitlab
   module Markdown
-    # HTML filter that replaces commit range references with links. References
-    # within <pre>, <code>, <a>, and <style> elements are ignored.
+    # HTML filter that replaces commit range references with links.
     #
     # This filter supports cross-project references.
-    #
-    # Context options:
-    #   :project (required) - Current project, ignored when reference is
-    #                         cross-project.
-    #   :reference_class    - Custom CSS class added to reference links.
-    #   :only_path          - Generate path-only links.
-    #
-    class CommitRangeReferenceFilter < HTML::Pipeline::Filter
+    class CommitRangeReferenceFilter < ReferenceFilter
       include CrossProjectReference
 
       # Public: Find commit range references in text
@@ -42,26 +32,10 @@ module Gitlab
       # This pattern supports cross-project references.
       COMMIT_RANGE_PATTERN = /(#{PROJECT_PATTERN}@)?(?<commit_range>\h{6,40}\.{2,3}\h{6,40})/
 
-      # Don't look for references in text nodes that are children of these
-      # elements.
-      IGNORE_PARENTS = %w(pre code a style).to_set
-
       def call
-        doc.search('text()').each do |node|
-          content = node.to_html
-
-          next if project.nil?
-          next unless content.match(COMMIT_RANGE_PATTERN)
-          next if has_ancestor?(node, IGNORE_PARENTS)
-
-          html = commit_range_link_filter(content)
-
-          next if html == content
-
-          node.replace(html)
+        replace_text_nodes_matching(COMMIT_RANGE_PATTERN) do |content|
+          commit_range_link_filter(content)
         end
-
-        doc
       end
 
       # Replace commit range references in text with links to compare the commit
@@ -82,7 +56,7 @@ module Gitlab
             url = url_for_commit_range(project, from_id, to_id)
 
             title = "Commits #{from_id} through #{to_id}"
-            klass = "gfm gfm-commit_range #{context[:reference_class]}".strip
+            klass = reference_class(:commit_range)
 
             project_ref += '@' if project_ref
 
@@ -95,10 +69,6 @@ module Gitlab
         end
       end
 
-      def validate
-        needs :project
-      end
-
       def split_commit_range(range)
         from_id, to_id = range.split(/\.{2,3}/, 2)
         from_id << "^" if range !~ /\.{3}/
@@ -118,10 +88,6 @@ module Gitlab
                                         from: from_id, to: to_id,
                                         only_path: context[:only_path])
       end
-
-      def project
-        context[:project]
-      end
     end
   end
 end
diff --git a/lib/gitlab/markdown/commit_reference_filter.rb b/lib/gitlab/markdown/commit_reference_filter.rb
index 5697d7d97e7..914eb29dc0c 100644
--- a/lib/gitlab/markdown/commit_reference_filter.rb
+++ b/lib/gitlab/markdown/commit_reference_filter.rb
@@ -1,19 +1,9 @@
-require 'html/pipeline'
-
 module Gitlab
   module Markdown
-    # HTML filter that replaces commit references with links. References within
-    # <pre>, <code>, <a>, and <style> elements are ignored.
+    # HTML filter that replaces commit references with links.
     #
     # This filter supports cross-project references.
-    #
-    # Context options:
-    #   :project (required) - Current project, ignored when reference is
-    #                         cross-project.
-    #   :reference_class    - Custom CSS class added to reference links.
-    #   :only_path          - Generate path-only links.
-    #
-    class CommitReferenceFilter < HTML::Pipeline::Filter
+    class CommitReferenceFilter < ReferenceFilter
       include CrossProjectReference
 
       # Public: Find commit references in text
@@ -41,30 +31,10 @@ module Gitlab
       # This pattern supports cross-project references.
       COMMIT_PATTERN = /(#{PROJECT_PATTERN}@)?(?<commit>\h{6,40})/
 
-      # Don't look for references in text nodes that are children of these
-      # elements.
-      IGNORE_PARENTS = %w(pre code a style).to_set
-
       def call
-        doc.search('text()').each do |node|
-          content = node.to_html
-
-          next if project.nil?
-          next unless content.match(COMMIT_PATTERN)
-          next if has_ancestor?(node, IGNORE_PARENTS)
-
-          html = commit_link_filter(content)
-
-          next if html == content
-
-          node.replace(html)
+        replace_text_nodes_matching(COMMIT_PATTERN) do |content|
+          commit_link_filter(content)
         end
-
-        doc
-      end
-
-      def validate
-        needs :project
       end
 
       # Replace commit references in text with links to the commit specified.
@@ -81,7 +51,7 @@ module Gitlab
             url = url_for_commit(project, commit)
 
             title = commit.link_title
-            klass = "gfm gfm-commit #{context[:reference_class]}".strip
+            klass = reference_class(:commit)
 
             project_ref += '@' if project_ref
 
@@ -99,10 +69,6 @@ module Gitlab
         h.namespace_project_commit_url(project.namespace, project, commit,
                                         only_path: context[:only_path])
       end
-
-      def project
-        context[:project]
-      end
     end
   end
 end
diff --git a/lib/gitlab/markdown/cross_project_reference.rb b/lib/gitlab/markdown/cross_project_reference.rb
index b2197432caa..c8ba9d1fa46 100644
--- a/lib/gitlab/markdown/cross_project_reference.rb
+++ b/lib/gitlab/markdown/cross_project_reference.rb
@@ -1,7 +1,7 @@
 module Gitlab
   module Markdown
-    # Includes shared code for reference filters that support an optional
-    # cross-project reference.
+    # Common methods for ReferenceFilters that support an optional cross-project
+    # reference.
     module CrossProjectReference
       NAMING_PATTERN  = Gitlab::Regex::NAMESPACE_REGEX_STR
       PROJECT_PATTERN = "(?<project>#{NAMING_PATTERN}/#{NAMING_PATTERN})"
@@ -9,9 +9,9 @@ module Gitlab
       # Given a cross-project reference string, get the Project record
       #
       # Defaults to value of `context[:project]` if:
-      # - No reference is given
-      # - Reference given doesn't exist
-      # - Reference given can't be read by the current user
+      # * No reference is given OR
+      # * Reference given doesn't exist OR
+      # * Reference given can't be read by the current user
       #
       # ref - String reference.
       #
diff --git a/lib/gitlab/markdown/external_issue_reference_filter.rb b/lib/gitlab/markdown/external_issue_reference_filter.rb
index 87f58b1ae79..3ca8eb7e4a7 100644
--- a/lib/gitlab/markdown/external_issue_reference_filter.rb
+++ b/lib/gitlab/markdown/external_issue_reference_filter.rb
@@ -1,16 +1,7 @@
-require 'html/pipeline'
-
 module Gitlab
   module Markdown
     # HTML filter that replaces external issue tracker references with links.
-    # References within <pre>, <code>, <a>, and <style> elements are ignored.
-    #
-    # Context options:
-    #   :project (required) - Current project.
-    #   :reference_class    - Custom CSS class added to reference links.
-    #   :only_path          - Generate path-only links.
-    #
-    class ExternalIssueReferenceFilter < HTML::Pipeline::Filter
+    class ExternalIssueReferenceFilter < ReferenceFilter
       # Public: Find `JIRA-123` issue references in text
       #
       #   ExternalIssueReferenceFilter.references_in(text) do |match, issue|
@@ -31,31 +22,10 @@ module Gitlab
       # Pattern used to extract `JIRA-123` issue references from text
       ISSUE_PATTERN = /(?<issue>([A-Z\-]+-)\d+)/
 
-      # Don't look for references in text nodes that are children of these
-      # elements.
-      IGNORE_PARENTS = %w(pre code a style).to_set
-
       def call
-        doc.search('text()').each do |node|
-          content = node.to_html
-
-          next if project.nil?
-          next if project.default_issues_tracker?
-          next unless content.match(ISSUE_PATTERN)
-          next if has_ancestor?(node, IGNORE_PARENTS)
-
-          html = issue_link_filter(content)
-
-          next if html == content
-
-          node.replace(html)
+        replace_text_nodes_matching(ISSUE_PATTERN) do |content|
+          issue_link_filter(content)
         end
-
-        doc
-      end
-
-      def validate
-        needs :project
       end
 
       # Replace `JIRA-123` issue references in text with links to the referenced
@@ -72,7 +42,7 @@ module Gitlab
           url = url_for_issue(issue, project, only_path: context[:only_path])
 
           title = "Issue in #{project.external_issue_tracker.title}"
-          klass = "gfm gfm-issue #{context[:reference_class]}".strip
+          klass = reference_class(:issue)
 
           %(<a href="#{url}"
                title="#{title}"
@@ -80,12 +50,6 @@ module Gitlab
         end
       end
 
-      # TODO (rspeicher): Duplicates IssueReferenceFilter
-      def project
-        context[:project]
-      end
-
-      # TODO (rspeicher): Duplicates IssueReferenceFilter
       def url_for_issue(*args)
         IssuesHelper.url_for_issue(*args)
       end
diff --git a/lib/gitlab/markdown/issue_reference_filter.rb b/lib/gitlab/markdown/issue_reference_filter.rb
index ab0420da199..680daaf6a1d 100644
--- a/lib/gitlab/markdown/issue_reference_filter.rb
+++ b/lib/gitlab/markdown/issue_reference_filter.rb
@@ -1,20 +1,10 @@
-require 'html/pipeline'
-
 module Gitlab
   module Markdown
-    # HTML filter that replaces issue references with links. References within
-    # <pre>, <code>, <a>, and <style> elements are ignored. References to issues
-    # that do not exist are ignored.
+    # HTML filter that replaces issue references with links. References to
+    # issues that do not exist are ignored.
     #
     # This filter supports cross-project references.
-    #
-    # Context options:
-    #   :project (required) - Current project, ignored when reference is
-    #                         cross-project.
-    #   :reference_class    - Custom CSS class added to reference links.
-    #   :only_path          - Generate path-only links.
-    #
-    class IssueReferenceFilter < HTML::Pipeline::Filter
+    class IssueReferenceFilter < ReferenceFilter
       include CrossProjectReference
 
       # Public: Find `#123` issue references in text
@@ -40,31 +30,10 @@ module Gitlab
       # This pattern supports cross-project references.
       ISSUE_PATTERN = /#{PROJECT_PATTERN}?\#(?<issue>([a-zA-Z\-]+-)?\d+)/
 
-      # Don't look for references in text nodes that are children of these
-      # elements.
-      IGNORE_PARENTS = %w(pre code a style).to_set
-
       def call
-        doc.search('text()').each do |node|
-          content = node.to_html
-
-          next if project.nil?
-          next unless project.default_issues_tracker?
-          next unless content.match(ISSUE_PATTERN)
-          next if has_ancestor?(node, IGNORE_PARENTS)
-
-          html = issue_link_filter(content)
-
-          next if html == content
-
-          node.replace(html)
+        replace_text_nodes_matching(ISSUE_PATTERN) do |content|
+          issue_link_filter(content)
         end
-
-        doc
-      end
-
-      def validate
-        needs :project
       end
 
       # Replace `#123` issue references in text with links to the referenced
@@ -79,11 +48,10 @@ module Gitlab
           project = self.project_from_ref(project_ref)
 
           if project.issue_exists?(issue)
-            # FIXME: Ugly
             url = url_for_issue(issue, project, only_path: context[:only_path])
 
             title = "Issue: #{title_for_issue(issue, project)}"
-            klass = "gfm gfm-issue #{context[:reference_class]}".strip
+            klass = reference_class(:issue)
 
             %(<a href="#{url}"
                  title="#{title}"
@@ -94,10 +62,6 @@ module Gitlab
         end
       end
 
-      def project
-        context[:project]
-      end
-
       def url_for_issue(*args)
         IssuesHelper.url_for_issue(*args)
       end
diff --git a/lib/gitlab/markdown/label_reference_filter.rb b/lib/gitlab/markdown/label_reference_filter.rb
index 3bb84c50b93..f40b981ba60 100644
--- a/lib/gitlab/markdown/label_reference_filter.rb
+++ b/lib/gitlab/markdown/label_reference_filter.rb
@@ -1,16 +1,7 @@
-require 'html/pipeline'
-
 module Gitlab
   module Markdown
-    # HTML filter that replaces label references with links. References within
-    # <pre>, <code>, <a>, and <style> elements are ignored.
-    #
-    # Context options:
-    #   :project (required) - Current project.
-    #   :reference_class    - Custom CSS class added to reference links.
-    #   :only_path          - Generate path-only links.
-    #
-    class LabelReferenceFilter < HTML::Pipeline::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|
@@ -42,30 +33,10 @@ module Gitlab
         )
       }x
 
-      # Don't look for references in text nodes that are children of these
-      # elements.
-      IGNORE_PARENTS = %w(pre code a style).to_set
-
       def call
-        doc.search('text()').each do |node|
-          content = node.to_html
-
-          next if project.nil?
-          next unless content.match(LABEL_PATTERN)
-          next if has_ancestor?(node, IGNORE_PARENTS)
-
-          html = label_link_filter(content)
-
-          next if html == content
-
-          node.replace(html)
+        replace_text_nodes_matching(LABEL_PATTERN) do |content|
+          label_link_filter(content)
         end
-
-        doc
-      end
-
-      def validate
-        needs :project
       end
 
       # Replace label references in text with links to the label specified.
@@ -83,7 +54,7 @@ module Gitlab
           if label = project.labels.find_by(params)
             url = url_for_label(project, label)
 
-            klass = "gfm gfm-label #{context[:reference_class]}".strip
+            klass = reference_class(:label)
 
             %(<a href="#{url}" class="#{klass}">#{render_colored_label(label)}</a>)
           else
@@ -118,10 +89,6 @@ module Gitlab
           { name: name.tr('\'"', '') }
         end
       end
-
-      def project
-        context[:project]
-      end
     end
   end
 end
diff --git a/lib/gitlab/markdown/merge_request_reference_filter.rb b/lib/gitlab/markdown/merge_request_reference_filter.rb
index 96a0c92942d..15f0c09ab00 100644
--- a/lib/gitlab/markdown/merge_request_reference_filter.rb
+++ b/lib/gitlab/markdown/merge_request_reference_filter.rb
@@ -1,20 +1,10 @@
-require 'html/pipeline'
-
 module Gitlab
   module Markdown
     # HTML filter that replaces merge request references with links. References
-    # within <pre>, <code>, <a>, and <style> elements are ignored. References to
-    # merge requests that do not exist are ignored.
+    # to merge requests that do not exist are ignored.
     #
     # This filter supports cross-project references.
-    #
-    # Context options:
-    #   :project (required) - Current project, ignored when reference is
-    #                         cross-project.
-    #   :reference_class    - Custom CSS class added to reference links.
-    #   :only_path          - Generate path-only links.
-    #
-    class MergeRequestReferenceFilter < HTML::Pipeline::Filter
+    class MergeRequestReferenceFilter < ReferenceFilter
       include CrossProjectReference
 
       # Public: Find `!123` merge request references in text
@@ -45,25 +35,9 @@ module Gitlab
       IGNORE_PARENTS = %w(pre code a style).to_set
 
       def call
-        doc.search('text()').each do |node|
-          content = node.to_html
-
-          next if project.nil?
-          next unless content.match(MERGE_REQUEST_PATTERN)
-          next if has_ancestor?(node, IGNORE_PARENTS)
-
-          html = merge_request_link_filter(content)
-
-          next if html == content
-
-          node.replace(html)
+        replace_text_nodes_matching(MERGE_REQUEST_PATTERN) do |content|
+          merge_request_link_filter(content)
         end
-
-        doc
-      end
-
-      def validate
-        needs :project
       end
 
       # Replace `!123` merge request references in text with links to the
@@ -79,7 +53,7 @@ module Gitlab
 
           if merge_request = project.merge_requests.find_by(iid: id)
             title = "Merge Request: #{merge_request.title}"
-            klass = "gfm gfm-merge_request #{context[:reference_class]}".strip
+            klass = reference_class(:merge_request)
 
             url = url_for_merge_request(merge_request, project)
 
@@ -92,10 +66,6 @@ module Gitlab
         end
       end
 
-      def project
-        context[:project]
-      end
-
       # TODO (rspeicher): Cleanup
       def url_for_merge_request(mr, project)
         h = Rails.application.routes.url_helpers
diff --git a/lib/gitlab/markdown/reference_filter.rb b/lib/gitlab/markdown/reference_filter.rb
index 55cb6a4e6bc..5778fd865df 100644
--- a/lib/gitlab/markdown/reference_filter.rb
+++ b/lib/gitlab/markdown/reference_filter.rb
@@ -7,8 +7,7 @@ module Gitlab
     # References within <pre>, <code>, <a>, and <style> elements are ignored.
     #
     # Context options:
-    #   :project (required) - Current project, ignored when reference is
-    #                         cross-project.
+    #   :project (required) - Current project, ignored if reference is cross-project.
     #   :reference_class    - Custom CSS class added to reference links.
     #   :only_path          - Generate path-only links.
     #
diff --git a/lib/gitlab/markdown/snippet_reference_filter.rb b/lib/gitlab/markdown/snippet_reference_filter.rb
index 42f035ce295..193a548af92 100644
--- a/lib/gitlab/markdown/snippet_reference_filter.rb
+++ b/lib/gitlab/markdown/snippet_reference_filter.rb
@@ -1,18 +1,10 @@
-require 'html/pipeline'
-
 module Gitlab
   module Markdown
-    # HTML filter that replaces snippet references with links. References within
-    # <pre>, <code>, <a>, and <style> elements are ignored. References to
+    # HTML filter that replaces snippet references with links. References to
     # snippets that do not exist are ignored.
     #
-    # Context options:
-    #   :project (required) - Current project, ignored when reference is
-    #                         cross-project.
-    #   :reference_class    - Custom CSS class added to reference links.
-    #   :only_path          - Generate path-only links.
-    #
-    class SnippetReferenceFilter < HTML::Pipeline::Filter
+    # This filter supports cross-project references.
+    class SnippetReferenceFilter < ReferenceFilter
       include CrossProjectReference
 
       # Public: Find `$123` snippet references in text
@@ -38,30 +30,10 @@ module Gitlab
       # This pattern supports cross-project references.
       SNIPPET_PATTERN = /#{PROJECT_PATTERN}?\$(?<snippet>\d+)/
 
-      # Don't look for references in text nodes that are children of these
-      # elements.
-      IGNORE_PARENTS = %w(pre code a style).to_set
-
       def call
-        doc.search('text()').each do |node|
-          content = node.to_html
-
-          next if context[:project].nil?
-          next unless content.match(SNIPPET_PATTERN)
-          next if has_ancestor?(node, IGNORE_PARENTS)
-
-          html = snippet_link_filter(content)
-
-          next if html == content
-
-          node.replace(html)
+        replace_text_nodes_matching(SNIPPET_PATTERN) do |content|
+          snippet_link_filter(content)
         end
-
-        doc
-      end
-
-      def validate
-        needs :project
       end
 
       # Replace `$123` snippet references in text with links to the referenced
@@ -77,7 +49,7 @@ module Gitlab
 
           if snippet = project.snippets.find_by(id: id)
             title = "Snippet: #{snippet.title}"
-            klass = "gfm gfm-snippet #{context[:reference_class]}".strip
+            klass = reference_class(:snippet)
 
             url = url_for_snippet(snippet, project)
 
diff --git a/lib/gitlab/markdown/user_reference_filter.rb b/lib/gitlab/markdown/user_reference_filter.rb
index 3ac82041ff4..5fc8ed55fe2 100644
--- a/lib/gitlab/markdown/user_reference_filter.rb
+++ b/lib/gitlab/markdown/user_reference_filter.rb
@@ -1,18 +1,9 @@
-require 'html/pipeline'
-
 module Gitlab
   module Markdown
-    # HTML filter that replaces user or group references with links. References
-    # within <pre>, <code>, <a>, and <style> elements are ignored.
+    # HTML filter that replaces user or group references with links.
     #
     # A special `@all` reference is also supported.
-    #
-    # Context options:
-    #   :project (required) - Current project.
-    #   :reference_class    - Custom CSS class added to reference links.
-    #   :only_path          - Generate path-only links.
-    #
-    class UserReferenceFilter < HTML::Pipeline::Filter
+    class UserReferenceFilter < ReferenceFilter
       # Public: Find `@user` user references in text
       #
       #   UserReferenceFilter.references_in(text) do |match, username|
@@ -33,30 +24,10 @@ module Gitlab
       # Pattern used to extract `@user` user references from text
       USER_PATTERN = /@(?<user>#{Gitlab::Regex::NAMESPACE_REGEX_STR})/
 
-      # Don't look for references in text nodes that are children of these
-      # elements.
-      IGNORE_PARENTS = %w(pre code a style).to_set
-
       def call
-        doc.search('text()').each do |node|
-          content = node.to_html
-
-          next if project.nil?
-          next unless content.match(USER_PATTERN)
-          next if has_ancestor?(node, IGNORE_PARENTS)
-
-          html = user_link_filter(content)
-
-          next if html == content
-
-          node.replace(html)
+        replace_text_nodes_matching(USER_PATTERN) do |content|
+          user_link_filter(content)
         end
-
-        doc
-      end
-
-      def validate
-        needs :project
       end
 
       # Replace `@user` user references in text with links to the referenced
@@ -70,7 +41,7 @@ module Gitlab
         project = context[:project]
 
         self.class.references_in(text) do |match, user|
-          klass = "gfm gfm-project_member #{context[:reference_class]}".strip
+          klass = reference_class(:project_member)
 
           if user == 'all'
             url = link_to_all(project)
@@ -94,27 +65,23 @@ module Gitlab
         end
       end
 
-      def project
-        context[:project]
+      private
+
+      def urls
+        Rails.application.routes.url_helpers
       end
 
-      # TODO (rspeicher): Cleanup
       def group_url(*args)
-        h = Rails.application.routes.url_helpers
-        h.group_url(*args)
+        urls.group_url(*args)
       end
 
-      # TODO (rspeicher): Cleanup
       def user_url(*args)
-        h = Rails.application.routes.url_helpers
-        h.user_url(*args)
+        urls.user_url(*args)
       end
 
-      # TODO (rspeicher): Cleanup
       def link_to_all(project)
-        h = Rails.application.routes.url_helpers
-        h.namespace_project_url(project.namespace, project,
-                                only_path: context[:only_path])
+        urls.namespace_project_url(project.namespace, project,
+                                   only_path: context[:only_path])
       end
 
       def user_can_reference_group?(group)

From 5b6c1a2182bfd1aa7b816c6654f38268ff597c2e Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Tue, 14 Apr 2015 19:01:09 -0400
Subject: [PATCH 40/80] Fix Issue and ExternalIssue reference specs

---
 .../external_issue_reference_filter.rb        |  4 ++++
 .../markdown/issue_reference_filter_spec.rb   | 22 +++++++++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/lib/gitlab/markdown/external_issue_reference_filter.rb b/lib/gitlab/markdown/external_issue_reference_filter.rb
index 3ca8eb7e4a7..c45cc805c71 100644
--- a/lib/gitlab/markdown/external_issue_reference_filter.rb
+++ b/lib/gitlab/markdown/external_issue_reference_filter.rb
@@ -1,6 +1,8 @@
 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
       #
@@ -23,6 +25,8 @@ module Gitlab
       ISSUE_PATTERN = /(?<issue>([A-Z\-]+-)\d+)/
 
       def call
+        return doc if project.default_issues_tracker?
+
         replace_text_nodes_matching(ISSUE_PATTERN) do |content|
           issue_link_filter(content)
         end
diff --git a/spec/lib/gitlab/markdown/issue_reference_filter_spec.rb b/spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
index e4a0d4c70e2..8cbf00a3de2 100644
--- a/spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
@@ -16,13 +16,6 @@ module Gitlab::Markdown
         to raise_error(ArgumentError, /:project/)
     end
 
-    it 'ignores valid references when using non-default tracker' do
-      expect(project).to receive(:default_issues_tracker?).and_return(false)
-
-      exp = act = "Issue ##{issue.iid}"
-      expect(filter(act).to_html).to eq exp
-    end
-
     %w(pre code a style).each do |elem|
       it "ignores valid references contained inside '#{elem}' element" do
         exp = act = "<#{elem}>Issue ##{issue.iid}</#{elem}>"
@@ -33,6 +26,13 @@ module Gitlab::Markdown
     context 'internal reference' do
       let(:reference) { "##{issue.iid}" }
 
+      it 'ignores valid references when using non-default tracker' do
+        expect(project).to receive(:issue_exists?).with(issue.iid).and_return(false)
+
+        exp = act = "Issue ##{issue.iid}"
+        expect(filter(act).to_html).to eq exp
+      end
+
       it 'links to a valid reference' do
         doc = filter("See #{reference}")
 
@@ -87,6 +87,14 @@ module Gitlab::Markdown
           to receive(:user_can_reference_project?).and_return(true)
       end
 
+      it 'ignores valid references when cross-reference project uses external tracker' do
+        expect_any_instance_of(Project).to receive(:issue_exists?).
+          with(issue.iid).and_return(false)
+
+        exp = act = "Issue ##{issue.iid}"
+        expect(filter(act).to_html).to eq exp
+      end
+
       it 'links to a valid reference' do
         doc = filter("See #{reference}")
 

From 9eaaa7cdef124d73b1c6b98e7af7a4fc18a76cf3 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Wed, 15 Apr 2015 12:10:12 -0400
Subject: [PATCH 41/80] Minor doc fix

[ci skip]
---
 lib/gitlab/markdown/reference_filter.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/gitlab/markdown/reference_filter.rb b/lib/gitlab/markdown/reference_filter.rb
index 5778fd865df..f28f9a1f643 100644
--- a/lib/gitlab/markdown/reference_filter.rb
+++ b/lib/gitlab/markdown/reference_filter.rb
@@ -40,7 +40,7 @@ module Gitlab
       # 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::Document object.
+      # Returns the updated Nokogiri::XML::Document object.
       def replace_text_nodes_matching(pattern)
         doc.search('text()').each do |node|
           content = node.to_html

From 31172475d220f7681abac0e46a171e315fdcfadc Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Wed, 15 Apr 2015 13:04:04 -0400
Subject: [PATCH 42/80] Better guard against nil projects in ReferenceFilter

---
 lib/gitlab/markdown/external_issue_reference_filter.rb | 3 ++-
 lib/gitlab/markdown/reference_filter.rb                | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/gitlab/markdown/external_issue_reference_filter.rb b/lib/gitlab/markdown/external_issue_reference_filter.rb
index c45cc805c71..cbbadc79847 100644
--- a/lib/gitlab/markdown/external_issue_reference_filter.rb
+++ b/lib/gitlab/markdown/external_issue_reference_filter.rb
@@ -25,7 +25,8 @@ module Gitlab
       ISSUE_PATTERN = /(?<issue>([A-Z\-]+-)\d+)/
 
       def call
-        return doc if project.default_issues_tracker?
+        # Early return if the project isn't using an external tracker
+        return doc if project.nil? || project.default_issues_tracker?
 
         replace_text_nodes_matching(ISSUE_PATTERN) do |content|
           issue_link_filter(content)
diff --git a/lib/gitlab/markdown/reference_filter.rb b/lib/gitlab/markdown/reference_filter.rb
index f28f9a1f643..7bd14020ecc 100644
--- a/lib/gitlab/markdown/reference_filter.rb
+++ b/lib/gitlab/markdown/reference_filter.rb
@@ -42,10 +42,11 @@ module Gitlab
       #
       # Returns the updated Nokogiri::XML::Document object.
       def replace_text_nodes_matching(pattern)
+        return doc if project.nil?
+
         doc.search('text()').each do |node|
           content = node.to_html
 
-          next if project.nil?
           next unless content.match(pattern)
           next if ignored_ancestry?(node)
 
@@ -59,6 +60,9 @@ module Gitlab
         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

From a3c71d9898ac762ebec8800a68f8aaae7671773c Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Wed, 15 Apr 2015 14:02:36 -0400
Subject: [PATCH 43/80] Add spec for ReferenceExtractor#labels

---
 spec/lib/gitlab/reference_extractor_spec.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/spec/lib/gitlab/reference_extractor_spec.rb b/spec/lib/gitlab/reference_extractor_spec.rb
index f34b6f3878e..6fba140f69d 100644
--- a/spec/lib/gitlab/reference_extractor_spec.rb
+++ b/spec/lib/gitlab/reference_extractor_spec.rb
@@ -106,6 +106,15 @@ describe Gitlab::ReferenceExtractor do
     expect(subject.merge_requests).to eq([@m1, @m0])
   end
 
+  it 'accesses valid labels' do
+    @l0 = create(:label, title: 'one', project: project)
+    @l1 = create(:label, title: 'two', project: project)
+    @l2 = create(:label)
+
+    subject.analyze("~#{@l0.id}, ~999, ~#{@l2.id}, ~#{@l1.id}")
+    expect(subject.labels).to eq([@l0, @l1])
+  end
+
   it 'accesses valid snippets' do
     @s0 = create(:project_snippet, project: project)
     @s1 = create(:project_snippet, project: project)

From b905702d4f02afaf580d2d83afc9168af95073ca Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Thu, 16 Apr 2015 12:41:59 -0400
Subject: [PATCH 44/80] Escape title attributes in references

---
 app/helpers/issues_helper.rb                              | 1 +
 app/helpers/labels_helper.rb                              | 7 +++++--
 lib/gitlab/markdown/commit_reference_filter.rb            | 2 +-
 lib/gitlab/markdown/external_issue_reference_filter.rb    | 2 +-
 lib/gitlab/markdown/issue_reference_filter.rb             | 2 +-
 lib/gitlab/markdown/merge_request_reference_filter.rb     | 2 +-
 lib/gitlab/markdown/reference_filter.rb                   | 5 +++++
 lib/gitlab/markdown/snippet_reference_filter.rb           | 2 +-
 spec/lib/gitlab/markdown/commit_reference_filter_spec.rb  | 7 +++++++
 .../markdown/external_issue_reference_filter_spec.rb      | 8 ++++++++
 spec/lib/gitlab/markdown/issue_reference_filter_spec.rb   | 7 +++++++
 .../markdown/merge_request_reference_filter_spec.rb       | 7 +++++++
 spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb | 7 +++++++
 13 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 7b034f22248..c3b4731dff3 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -109,5 +109,6 @@ module IssuesHelper
     end
   end
 
+  # Required for Gitlab::Markdown::IssueReferenceFilter
   module_function :url_for_issue, :title_for_issue
 end
diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
index 0259829a059..8272c177d59 100644
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -1,4 +1,6 @@
 module LabelsHelper
+  include ActionView::Helpers::TagHelper
+
   def project_label_names
     @project.labels.pluck(:title)
   end
@@ -11,7 +13,7 @@ module LabelsHelper
     # by LabelReferenceFilter
     span = %(<span class="label color-label") +
       %( style="background-color: #{label_color}; color: #{text_color}">) +
-      label.name + '</span>'
+      escape_once(label.name) + '</span>'
 
     span.html_safe
   end
@@ -56,5 +58,6 @@ module LabelsHelper
     options_from_collection_for_select(project.labels, 'name', 'name', params[:label_name])
   end
 
-  module_function :render_colored_label, :text_color_for_bg
+  # Required for Gitlab::Markdown::LabelReferenceFilter
+  module_function :render_colored_label, :text_color_for_bg, :escape_once
 end
diff --git a/lib/gitlab/markdown/commit_reference_filter.rb b/lib/gitlab/markdown/commit_reference_filter.rb
index 914eb29dc0c..5a7eca7e5b0 100644
--- a/lib/gitlab/markdown/commit_reference_filter.rb
+++ b/lib/gitlab/markdown/commit_reference_filter.rb
@@ -50,7 +50,7 @@ module Gitlab
           if project.valid_repo? && commit = project.repository.commit(commit_ref)
             url = url_for_commit(project, commit)
 
-            title = commit.link_title
+            title = escape_once(commit.link_title)
             klass = reference_class(:commit)
 
             project_ref += '@' if project_ref
diff --git a/lib/gitlab/markdown/external_issue_reference_filter.rb b/lib/gitlab/markdown/external_issue_reference_filter.rb
index cbbadc79847..0fc3f4cca06 100644
--- a/lib/gitlab/markdown/external_issue_reference_filter.rb
+++ b/lib/gitlab/markdown/external_issue_reference_filter.rb
@@ -46,7 +46,7 @@ module Gitlab
         self.class.references_in(text) do |match, issue|
           url = url_for_issue(issue, project, only_path: context[:only_path])
 
-          title = "Issue in #{project.external_issue_tracker.title}"
+          title = escape_once("Issue in #{project.external_issue_tracker.title}")
           klass = reference_class(:issue)
 
           %(<a href="#{url}"
diff --git a/lib/gitlab/markdown/issue_reference_filter.rb b/lib/gitlab/markdown/issue_reference_filter.rb
index 680daaf6a1d..13d2ba4bab3 100644
--- a/lib/gitlab/markdown/issue_reference_filter.rb
+++ b/lib/gitlab/markdown/issue_reference_filter.rb
@@ -50,7 +50,7 @@ module Gitlab
           if project.issue_exists?(issue)
             url = url_for_issue(issue, project, only_path: context[:only_path])
 
-            title = "Issue: #{title_for_issue(issue, project)}"
+            title = escape_once("Issue: #{title_for_issue(issue, project)}")
             klass = reference_class(:issue)
 
             %(<a href="#{url}"
diff --git a/lib/gitlab/markdown/merge_request_reference_filter.rb b/lib/gitlab/markdown/merge_request_reference_filter.rb
index 15f0c09ab00..372543783e6 100644
--- a/lib/gitlab/markdown/merge_request_reference_filter.rb
+++ b/lib/gitlab/markdown/merge_request_reference_filter.rb
@@ -52,7 +52,7 @@ module Gitlab
           project = self.project_from_ref(project_ref)
 
           if merge_request = project.merge_requests.find_by(iid: id)
-            title = "Merge Request: #{merge_request.title}"
+            title = escape_once("Merge Request: #{merge_request.title}")
             klass = reference_class(:merge_request)
 
             url = url_for_merge_request(merge_request, project)
diff --git a/lib/gitlab/markdown/reference_filter.rb b/lib/gitlab/markdown/reference_filter.rb
index 7bd14020ecc..26663c8d990 100644
--- a/lib/gitlab/markdown/reference_filter.rb
+++ b/lib/gitlab/markdown/reference_filter.rb
@@ -1,3 +1,4 @@
+require 'active_support/core_ext/string/output_safety'
 require 'html/pipeline'
 
 module Gitlab
@@ -12,6 +13,10 @@ module Gitlab
     #   :only_path          - Generate path-only links.
     #
     class ReferenceFilter < HTML::Pipeline::Filter
+      def escape_once(html)
+        ERB::Util.html_escape_once(html)
+      end
+
       # Don't look for references in text nodes that are children of these
       # elements.
       IGNORE_PARENTS = %w(pre code a style).to_set
diff --git a/lib/gitlab/markdown/snippet_reference_filter.rb b/lib/gitlab/markdown/snippet_reference_filter.rb
index 193a548af92..9cada5abaa0 100644
--- a/lib/gitlab/markdown/snippet_reference_filter.rb
+++ b/lib/gitlab/markdown/snippet_reference_filter.rb
@@ -48,7 +48,7 @@ module Gitlab
           project = self.project_from_ref(project_ref)
 
           if snippet = project.snippets.find_by(id: id)
-            title = "Snippet: #{snippet.title}"
+            title = escape_once("Snippet: #{snippet.title}")
             klass = reference_class(:snippet)
 
             url = url_for_snippet(snippet, project)
diff --git a/spec/lib/gitlab/markdown/commit_reference_filter_spec.rb b/spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
index 84f773669f2..55256fa3a90 100644
--- a/spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
@@ -51,6 +51,13 @@ module Gitlab::Markdown
         expect(doc.css('a').first.attr('title')).to eq commit.link_title
       end
 
+      it 'escapes the title attribute' do
+        allow_any_instance_of(Commit).to receive(:title).and_return(%{"></a>whatever<a title="})
+
+        doc = filter("See #{reference}")
+        expect(doc.text).to eq "See #{commit.id}"
+      end
+
       it 'includes default classes' do
         doc = filter("See #{reference}")
         expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-commit'
diff --git a/spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb b/spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb
index 37c91195202..27e930ef7da 100644
--- a/spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb
@@ -80,6 +80,14 @@ module Gitlab::Markdown
         expect(doc.css('a').first.attr('title')).to eq "Issue in JIRA tracker"
       end
 
+      it 'escapes the title attribute' do
+        allow(project.external_issue_tracker).to receive(:title).
+          and_return(%{"></a>whatever<a title="})
+
+        doc = filter("Issue #{reference}")
+        expect(doc.text).to eq "Issue #{reference}"
+      end
+
       it 'includes default classes' do
         doc = filter("Issue #{reference}")
         expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-issue'
diff --git a/spec/lib/gitlab/markdown/issue_reference_filter_spec.rb b/spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
index 8cbf00a3de2..892e530527e 100644
--- a/spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
@@ -57,6 +57,13 @@ module Gitlab::Markdown
         expect(doc.css('a').first.attr('title')).to eq "Issue: #{issue.title}"
       end
 
+      it 'escapes the title attribute' do
+        issue.update_attribute(:title, %{"></a>whatever<a title="})
+
+        doc = filter("Issue #{reference}")
+        expect(doc.text).to eq "Issue #{reference}"
+      end
+
       it 'includes default classes' do
         doc = filter("Issue #{reference}")
         expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-issue'
diff --git a/spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb b/spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb
index c3026edbf89..c9be5d5deae 100644
--- a/spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb
@@ -45,6 +45,13 @@ module Gitlab::Markdown
         expect(doc.css('a').first.attr('title')).to eq "Merge Request: #{merge.title}"
       end
 
+      it 'escapes the title attribute' do
+        merge.update_attribute(:title, %{"></a>whatever<a title="})
+
+        doc = filter("Merge #{reference}")
+        expect(doc.text).to eq "Merge #{reference}"
+      end
+
       it 'includes default classes' do
         doc = filter("Merge #{reference}")
         expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-merge_request'
diff --git a/spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb b/spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
index 3d30cacb0b1..285d6dc8547 100644
--- a/spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
@@ -44,6 +44,13 @@ module Gitlab::Markdown
         expect(doc.css('a').first.attr('title')).to eq "Snippet: #{snippet.title}"
       end
 
+      it 'escapes the title attribute' do
+        snippet.update_attribute(:title, %{"></a>whatever<a title="})
+
+        doc = filter("Snippet #{reference}")
+        expect(doc.text).to eq "Snippet #{reference}"
+      end
+
       it 'includes default classes' do
         doc = filter("Snippet #{reference}")
         expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-snippet'

From 621687bfdf31596af9b7ef8e0996a61afaffce84 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Thu, 16 Apr 2015 13:05:49 -0400
Subject: [PATCH 45/80] Fix `user_can_reference_project?` check

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

diff --git a/lib/gitlab/markdown/cross_project_reference.rb b/lib/gitlab/markdown/cross_project_reference.rb
index c8ba9d1fa46..1ef6436451d 100644
--- a/lib/gitlab/markdown/cross_project_reference.rb
+++ b/lib/gitlab/markdown/cross_project_reference.rb
@@ -29,7 +29,7 @@ module Gitlab
       end
 
       def user_can_reference_project?(project, user = context[:current_user])
-        user && Ability.abilities.allowed?(user, :read_project, project)
+        Ability.abilities.allowed?(user, :read_project, project)
       end
     end
   end

From 6853465acfc5887fd683a662afbaac1dbadd6aab Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Thu, 16 Apr 2015 13:25:57 -0400
Subject: [PATCH 46/80] Remove extraneous IGNORE_PARENTS from filter

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

diff --git a/lib/gitlab/markdown/merge_request_reference_filter.rb b/lib/gitlab/markdown/merge_request_reference_filter.rb
index 372543783e6..38edf0a140c 100644
--- a/lib/gitlab/markdown/merge_request_reference_filter.rb
+++ b/lib/gitlab/markdown/merge_request_reference_filter.rb
@@ -30,10 +30,6 @@ module Gitlab
       # This pattern supports cross-project references.
       MERGE_REQUEST_PATTERN = /#{PROJECT_PATTERN}?!(?<merge_request>\d+)/
 
-      # Don't look for references in text nodes that are children of these
-      # elements.
-      IGNORE_PARENTS = %w(pre code a style).to_set
-
       def call
         replace_text_nodes_matching(MERGE_REQUEST_PATTERN) do |content|
           merge_request_link_filter(content)

From 34f1dbb143f5b3ddfb8b8fdd73f5991638f8bb7c Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Wed, 15 Apr 2015 15:54:55 -0400
Subject: [PATCH 47/80] Better commit lookup for CommitRangeReferenceFilter

---
 .../markdown/commit_range_reference_filter.rb  | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/lib/gitlab/markdown/commit_range_reference_filter.rb b/lib/gitlab/markdown/commit_range_reference_filter.rb
index ff85be8cb84..80c57b158a1 100644
--- a/lib/gitlab/markdown/commit_range_reference_filter.rb
+++ b/lib/gitlab/markdown/commit_range_reference_filter.rb
@@ -24,6 +24,12 @@ module Gitlab
         end
       end
 
+      def initialize(*args)
+        super
+
+        @commit_map = {}
+      end
+
       # Pattern used to extract commit range references from text
       #
       # The beginning and ending SHA1 sums can be between 6 and 40 hex
@@ -76,10 +82,16 @@ module Gitlab
         [from_id, to_id]
       end
 
+      def commit(id)
+        unless @commit_map[id]
+          @commit_map[id] = project.repository.commit(id)
+        end
+
+        @commit_map[id]
+      end
+
       def valid_range?(project, from_id, to_id)
-        project.valid_repo? &&
-          project.repository.commit(from_id) &&
-          project.repository.commit(to_id)
+        project.valid_repo? && commit(from_id) && commit(to_id)
       end
 
       def url_for_commit_range(project, from_id, to_id)

From 3a0b4340aae05510671f9110bb46d356c5bc497b Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Thu, 16 Apr 2015 14:05:13 -0400
Subject: [PATCH 48/80] Add more tests for cross-project references

---
 .../commit_range_reference_filter_spec.rb     | 47 +++++++++------
 .../markdown/commit_reference_filter_spec.rb  | 41 ++++++++-----
 .../markdown/issue_reference_filter_spec.rb   | 59 +++++++++++--------
 .../merge_request_reference_filter_spec.rb    | 45 ++++++++------
 .../markdown/snippet_reference_filter_spec.rb | 43 ++++++++------
 spec/support/reference_filter_spec_helper.rb  | 10 ++++
 6 files changed, 150 insertions(+), 95 deletions(-)

diff --git a/spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb b/spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
index 16597ff6859..5ebdc8926e2 100644
--- a/spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
@@ -90,29 +90,38 @@ module Gitlab::Markdown
       let(:commit2)   { project.repository.commit("HEAD~2") }
       let(:reference) { "#{project2.path_with_namespace}@#{commit1.id}...#{commit2.id}" }
 
-      before do
-        allow_any_instance_of(described_class).
-          to receive(:user_can_reference_project?).and_return(true)
+      context 'when user can access reference' do
+        before { allow_cross_reference! }
+
+        it 'links to a valid reference' do
+          doc = filter("See #{reference}")
+
+          expect(doc.css('a').first.attr('href')).
+            to eq urls.namespace_project_compare_url(project2.namespace, project2, from: commit1.id, to: commit2.id)
+        end
+
+        it 'links with adjacent text' do
+          doc = filter("Fixed (#{reference}.)")
+          expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
+        end
+
+        it 'ignores invalid commit IDs on the referenced project' do
+          exp = act = "Fixed #{project2.path_with_namespace}##{commit1.id.reverse}...#{commit2.id}"
+          expect(filter(act).to_html).to eq exp
+
+          exp = act = "Fixed #{project2.path_with_namespace}##{commit1.id}...#{commit2.id.reverse}"
+          expect(filter(act).to_html).to eq exp
+        end
       end
 
-      it 'links to a valid reference' do
-        doc = filter("See #{reference}")
+      context 'when user cannot access reference' do
+        before { disallow_cross_reference! }
 
-        expect(doc.css('a').first.attr('href')).
-          to eq urls.namespace_project_compare_url(project2.namespace, project2, from: commit1.id, to: commit2.id)
-      end
+        it 'ignores valid references' do
+          exp = act = "See #{reference}"
 
-      it 'links with adjacent text' do
-        doc = filter("Fixed (#{reference}.)")
-        expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
-      end
-
-      it 'ignores invalid commit IDs on the referenced project' do
-        exp = act = "Fixed #{project2.path_with_namespace}##{commit1.id.reverse}...#{commit2.id}"
-        expect(filter(act).to_html).to eq exp
-
-        exp = act = "Fixed #{project2.path_with_namespace}##{commit1.id}...#{commit2.id.reverse}"
-        expect(filter(act).to_html).to eq exp
+          expect(filter(act).to_html).to eq exp
+        end
       end
     end
   end
diff --git a/spec/lib/gitlab/markdown/commit_reference_filter_spec.rb b/spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
index 55256fa3a90..71fd2db2c58 100644
--- a/spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
@@ -83,26 +83,35 @@ module Gitlab::Markdown
       let(:commit)    { project.repository.commit }
       let(:reference) { "#{project2.path_with_namespace}@#{commit.id}" }
 
-      before do
-        allow_any_instance_of(described_class).
-          to receive(:user_can_reference_project?).and_return(true)
+      context 'when user can access reference' do
+        before { allow_cross_reference! }
+
+        it 'links to a valid reference' do
+          doc = filter("See #{reference}")
+
+          expect(doc.css('a').first.attr('href')).
+            to eq urls.namespace_project_commit_url(project2.namespace, project2, commit.id)
+        end
+
+        it 'links with adjacent text' do
+          doc = filter("Fixed (#{reference}.)")
+          expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
+        end
+
+        it 'ignores invalid commit IDs on the referenced project' do
+          exp = act = "Committed #{project2.path_with_namespace}##{commit.id.reverse}"
+          expect(filter(act).to_html).to eq exp
+        end
       end
 
-      it 'links to a valid reference' do
-        doc = filter("See #{reference}")
+      context 'when user cannot access reference' do
+        before { disallow_cross_reference! }
 
-        expect(doc.css('a').first.attr('href')).
-          to eq urls.namespace_project_commit_url(project2.namespace, project2, commit.id)
-      end
+        it 'ignores valid references' do
+          exp = act = "See #{reference}"
 
-      it 'links with adjacent text' do
-        doc = filter("Fixed (#{reference}.)")
-        expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
-      end
-
-      it 'ignores invalid commit IDs on the referenced project' do
-        exp = act = "Committed #{project2.path_with_namespace}##{commit.id.reverse}"
-        expect(filter(act).to_html).to eq exp
+          expect(filter(act).to_html).to eq exp
+        end
       end
     end
   end
diff --git a/spec/lib/gitlab/markdown/issue_reference_filter_spec.rb b/spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
index 892e530527e..f95b37d6954 100644
--- a/spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
@@ -89,35 +89,44 @@ module Gitlab::Markdown
       let(:issue)     { create(:issue, project: project2) }
       let(:reference) { "#{project2.path_with_namespace}##{issue.iid}" }
 
-      before do
-        allow_any_instance_of(described_class).
-          to receive(:user_can_reference_project?).and_return(true)
+      context 'when user can access reference' do
+        before { allow_cross_reference! }
+
+        it 'ignores valid references when cross-reference project uses external tracker' do
+          expect_any_instance_of(Project).to receive(:issue_exists?).
+            with(issue.iid).and_return(false)
+
+          exp = act = "Issue ##{issue.iid}"
+          expect(filter(act).to_html).to eq exp
+        end
+
+        it 'links to a valid reference' do
+          doc = filter("See #{reference}")
+
+          expect(doc.css('a').first.attr('href')).
+            to eq helper.url_for_issue(issue.iid, project2)
+        end
+
+        it 'links with adjacent text' do
+          doc = filter("Fixed (#{reference}.)")
+          expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
+        end
+
+        it 'ignores invalid issue IDs on the referenced project' do
+          exp = act = "Fixed #{project2.path_with_namespace}##{issue.iid + 1}"
+
+          expect(filter(act).to_html).to eq exp
+        end
       end
 
-      it 'ignores valid references when cross-reference project uses external tracker' do
-        expect_any_instance_of(Project).to receive(:issue_exists?).
-          with(issue.iid).and_return(false)
+      context 'when user cannot access reference' do
+        before { disallow_cross_reference! }
 
-        exp = act = "Issue ##{issue.iid}"
-        expect(filter(act).to_html).to eq exp
-      end
+        it 'ignores valid references' do
+          exp = act = "See #{reference}"
 
-      it 'links to a valid reference' do
-        doc = filter("See #{reference}")
-
-        expect(doc.css('a').first.attr('href')).
-          to eq helper.url_for_issue(issue.iid, project2)
-      end
-
-      it 'links with adjacent text' do
-        doc = filter("Fixed (#{reference}.)")
-        expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
-      end
-
-      it 'ignores invalid issue IDs on the referenced project' do
-        exp = act = "Fixed #{project2.path_with_namespace}##{issue.iid + 1}"
-
-        expect(filter(act).to_html).to eq exp
+          expect(filter(act).to_html).to eq exp
+        end
       end
     end
   end
diff --git a/spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb b/spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb
index c9be5d5deae..0f66442269b 100644
--- a/spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb
@@ -77,28 +77,37 @@ module Gitlab::Markdown
       let(:merge)     { create(:merge_request, source_project: project2) }
       let(:reference) { "#{project2.path_with_namespace}!#{merge.iid}" }
 
-      before do
-        allow_any_instance_of(described_class).
-          to receive(:user_can_reference_project?).and_return(true)
+      context 'when user can access reference' do
+        before { allow_cross_reference! }
+
+        it 'links to a valid reference' do
+          doc = filter("See #{reference}")
+
+          expect(doc.css('a').first.attr('href')).
+            to eq urls.namespace_project_merge_request_url(project2.namespace,
+                                                          project, merge)
+        end
+
+        it 'links with adjacent text' do
+          doc = filter("Merge (#{reference}.)")
+          expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
+        end
+
+        it 'ignores invalid merge IDs on the referenced project' do
+          exp = act = "Merge #{project2.path_with_namespace}!#{merge.iid + 1}"
+
+          expect(filter(act).to_html).to eq exp
+        end
       end
 
-      it 'links to a valid reference' do
-        doc = filter("See #{reference}")
+      context 'when user cannot access reference' do
+        before { disallow_cross_reference! }
 
-        expect(doc.css('a').first.attr('href')).
-          to eq urls.namespace_project_merge_request_url(project2.namespace,
-                                                         project, merge)
-      end
+        it 'ignores valid references' do
+          exp = act = "See #{reference}"
 
-      it 'links with adjacent text' do
-        doc = filter("Merge (#{reference}.)")
-        expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
-      end
-
-      it 'ignores invalid merge IDs on the referenced project' do
-        exp = act = "Merge #{project2.path_with_namespace}!#{merge.iid + 1}"
-
-        expect(filter(act).to_html).to eq exp
+          expect(filter(act).to_html).to eq exp
+        end
       end
     end
   end
diff --git a/spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb b/spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
index 285d6dc8547..79533a90b55 100644
--- a/spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
@@ -76,27 +76,36 @@ module Gitlab::Markdown
       let(:snippet)   { create(:project_snippet, project: project2) }
       let(:reference) { "#{project2.path_with_namespace}$#{snippet.id}" }
 
-      before do
-        allow_any_instance_of(described_class).
-          to receive(:user_can_reference_project?).and_return(true)
+      context 'when user can access reference' do
+        before { allow_cross_reference! }
+
+        it 'links to a valid reference' do
+          doc = filter("See #{reference}")
+
+          expect(doc.css('a').first.attr('href')).
+            to eq urls.namespace_project_snippet_url(project2.namespace, project2, snippet)
+        end
+
+        it 'links with adjacent text' do
+          doc = filter("See (#{reference}.)")
+          expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
+        end
+
+        it 'ignores invalid snippet IDs on the referenced project' do
+          exp = act = "See #{project2.path_with_namespace}$#{snippet.id + 1}"
+
+          expect(filter(act).to_html).to eq exp
+        end
       end
 
-      it 'links to a valid reference' do
-        doc = filter("See #{reference}")
+      context 'when user cannot access reference' do
+        before { disallow_cross_reference! }
 
-        expect(doc.css('a').first.attr('href')).
-          to eq urls.namespace_project_snippet_url(project2.namespace, project2, snippet)
-      end
+        it 'ignores valid references' do
+          exp = act = "See #{reference}"
 
-      it 'links with adjacent text' do
-        doc = filter("See (#{reference}.)")
-        expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(reference)}<\/a>\.\)/)
-      end
-
-      it 'ignores invalid snippet IDs on the referenced project' do
-        exp = act = "See #{project2.path_with_namespace}$#{snippet.id + 1}"
-
-        expect(filter(act).to_html).to eq exp
+          expect(filter(act).to_html).to eq exp
+        end
       end
     end
   end
diff --git a/spec/support/reference_filter_spec_helper.rb b/spec/support/reference_filter_spec_helper.rb
index e4138405602..bcee5715cad 100644
--- a/spec/support/reference_filter_spec_helper.rb
+++ b/spec/support/reference_filter_spec_helper.rb
@@ -34,4 +34,14 @@ module ReferenceFilterSpecHelper
     contexts.reverse_merge!(project: project)
     described_class.call(html, contexts)
   end
+
+  def allow_cross_reference!
+    allow_any_instance_of(described_class).
+      to receive(:user_can_reference_project?).and_return(true)
+  end
+
+  def disallow_cross_reference!
+    allow_any_instance_of(described_class).
+      to receive(:user_can_reference_project?).and_return(false)
+  end
 end

From 2823c058d8cff59f10f57a106e0e1e4e3c0b2870 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Thu, 16 Apr 2015 14:06:05 -0400
Subject: [PATCH 49/80] project_from_ref returns nil when reference can't be
 accessed

Prior it would return the project from the current context, which wasn't
the intended behavior.
---
 lib/gitlab/markdown/commit_range_reference_filter.rb     | 2 +-
 lib/gitlab/markdown/commit_reference_filter.rb           | 8 +++++++-
 lib/gitlab/markdown/cross_project_reference.rb           | 7 +++----
 lib/gitlab/markdown/issue_reference_filter.rb            | 2 +-
 lib/gitlab/markdown/merge_request_reference_filter.rb    | 2 +-
 lib/gitlab/markdown/snippet_reference_filter.rb          | 2 +-
 spec/lib/gitlab/markdown/cross_project_reference_spec.rb | 4 ++--
 7 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/lib/gitlab/markdown/commit_range_reference_filter.rb b/lib/gitlab/markdown/commit_range_reference_filter.rb
index 80c57b158a1..1128c1bed7a 100644
--- a/lib/gitlab/markdown/commit_range_reference_filter.rb
+++ b/lib/gitlab/markdown/commit_range_reference_filter.rb
@@ -91,7 +91,7 @@ module Gitlab
       end
 
       def valid_range?(project, from_id, to_id)
-        project.valid_repo? && commit(from_id) && commit(to_id)
+        project && project.valid_repo? && commit(from_id) && commit(to_id)
       end
 
       def url_for_commit_range(project, from_id, to_id)
diff --git a/lib/gitlab/markdown/commit_reference_filter.rb b/lib/gitlab/markdown/commit_reference_filter.rb
index 5a7eca7e5b0..745de6402cf 100644
--- a/lib/gitlab/markdown/commit_reference_filter.rb
+++ b/lib/gitlab/markdown/commit_reference_filter.rb
@@ -47,7 +47,7 @@ module Gitlab
         self.class.references_in(text) do |match, commit_ref, project_ref|
           project = self.project_from_ref(project_ref)
 
-          if project.valid_repo? && commit = project.repository.commit(commit_ref)
+          if commit = commit_from_ref(project, commit_ref)
             url = url_for_commit(project, commit)
 
             title = escape_once(commit.link_title)
@@ -64,6 +64,12 @@ module Gitlab
         end
       end
 
+      def commit_from_ref(project, commit_ref)
+        if project && project.valid_repo?
+          project.repository.commit(commit_ref)
+        end
+      end
+
       def url_for_commit(project, commit)
         h = Rails.application.routes.url_helpers
         h.namespace_project_commit_url(project.namespace, project, commit,
diff --git a/lib/gitlab/markdown/cross_project_reference.rb b/lib/gitlab/markdown/cross_project_reference.rb
index 1ef6436451d..de05102751f 100644
--- a/lib/gitlab/markdown/cross_project_reference.rb
+++ b/lib/gitlab/markdown/cross_project_reference.rb
@@ -10,18 +10,17 @@ module Gitlab
       #
       # Defaults to value of `context[:project]` if:
       # * No reference is given OR
-      # * Reference given doesn't exist OR
-      # * Reference given can't be read by the current user
+      # * Reference given doesn't exist
       #
       # ref - String reference.
       #
-      # Returns a Project
+      # Returns a Project, or nil if the reference can't be accessed
       def project_from_ref(ref)
         if ref && other = Project.find_with_namespace(ref)
           if user_can_reference_project?(other)
             other
           else
-            context[:project]
+            nil
           end
         else
           context[:project]
diff --git a/lib/gitlab/markdown/issue_reference_filter.rb b/lib/gitlab/markdown/issue_reference_filter.rb
index 13d2ba4bab3..c9267cc3e9d 100644
--- a/lib/gitlab/markdown/issue_reference_filter.rb
+++ b/lib/gitlab/markdown/issue_reference_filter.rb
@@ -47,7 +47,7 @@ module Gitlab
         self.class.references_in(text) do |match, issue, project_ref|
           project = self.project_from_ref(project_ref)
 
-          if project.issue_exists?(issue)
+          if project && project.issue_exists?(issue)
             url = url_for_issue(issue, project, only_path: context[:only_path])
 
             title = escape_once("Issue: #{title_for_issue(issue, project)}")
diff --git a/lib/gitlab/markdown/merge_request_reference_filter.rb b/lib/gitlab/markdown/merge_request_reference_filter.rb
index 38edf0a140c..40239523cda 100644
--- a/lib/gitlab/markdown/merge_request_reference_filter.rb
+++ b/lib/gitlab/markdown/merge_request_reference_filter.rb
@@ -47,7 +47,7 @@ module Gitlab
         self.class.references_in(text) do |match, id, project_ref|
           project = self.project_from_ref(project_ref)
 
-          if merge_request = project.merge_requests.find_by(iid: id)
+          if project && merge_request = project.merge_requests.find_by(iid: id)
             title = escape_once("Merge Request: #{merge_request.title}")
             klass = reference_class(:merge_request)
 
diff --git a/lib/gitlab/markdown/snippet_reference_filter.rb b/lib/gitlab/markdown/snippet_reference_filter.rb
index 9cada5abaa0..ada67de992b 100644
--- a/lib/gitlab/markdown/snippet_reference_filter.rb
+++ b/lib/gitlab/markdown/snippet_reference_filter.rb
@@ -47,7 +47,7 @@ module Gitlab
         self.class.references_in(text) do |match, id, project_ref|
           project = self.project_from_ref(project_ref)
 
-          if snippet = project.snippets.find_by(id: id)
+          if project && snippet = project.snippets.find_by(id: id)
             title = escape_once("Snippet: #{snippet.title}")
             klass = reference_class(:snippet)
 
diff --git a/spec/lib/gitlab/markdown/cross_project_reference_spec.rb b/spec/lib/gitlab/markdown/cross_project_reference_spec.rb
index 0632c1c71e9..d79b2c1af92 100644
--- a/spec/lib/gitlab/markdown/cross_project_reference_spec.rb
+++ b/spec/lib/gitlab/markdown/cross_project_reference_spec.rb
@@ -37,11 +37,11 @@ module Gitlab::Markdown
         end
 
         context 'and the user does not have permission to read it' do
-          it 'returns the project from context' do
+          it 'returns nil' do
             expect(self).to receive(:user_can_reference_project?).
               with(project2).and_return(false)
 
-            expect(project_from_ref('cross/reference')).to eq context[:project]
+            expect(project_from_ref('cross/reference')).to be_nil
           end
         end
       end

From b595249462346d48817330baf8c253b6f08690a1 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Fri, 17 Apr 2015 12:15:10 -0400
Subject: [PATCH 50/80] Update markdown docs with latest references
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also, tables! (╯°□°）╯︵ ┻━┻)
---
 doc/markdown/markdown.md | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/doc/markdown/markdown.md b/doc/markdown/markdown.md
index 5c8b161cb6c..8ec5a20035f 100644
--- a/doc/markdown/markdown.md
+++ b/doc/markdown/markdown.md
@@ -163,7 +163,7 @@ Consult the [Emoji Cheat Sheet](http://emoji.codes) for a list of all supported
 
 ## Special GitLab References
 
-GFM recognized special references.
+GFM recognizes special references.
 
 You can easily reference e.g. an issue, a commit, a team member or even the whole team within a project.
 
@@ -171,23 +171,30 @@ GFM will turn that reference into a link so you can navigate between them easily
 
 GFM will recognize the following:
 
-- @foo : for specific team members or groups
-- @all : for the whole team
-- #123 : for issues
-- !123 : for merge requests
-- $123 : for snippets
-- ~123 : for labels
-- 9ba12248 : for specific commits
-- 9ba12248...b19a04f5 : for commit range comparisons
-- \[file\](path/to/file) : for file references
+| input                  | references                 |
+|-----------------------:|:---------------------------|
+| `@user_name`           | specific user              |
+| `@group_name`          | specific group             |
+| `@all`                 | entire team                |
+| `#123`                 | issue                      |
+| `!123`                 | merge request              |
+| `$123`                 | snippet                    |
+| `~123`                 | label by ID                |
+| `~bug`                 | one-word label by name     |
+| `~"feature request"`   | multi-word label by name   |
+| `9ba12248`             | specific commit            |
+| `9ba12248...b19a04f5`  | commit range comparison    |
+| `[README](doc/README)` | repository file references |
 
-GFM also recognizes references to commits, issues, and merge requests in other projects:
+GFM also recognizes certain cross-project references:
 
-- namespace/project#123 : for issues
-- namespace/project!123 : for merge requests
-- namespace/project$123 : for snippets
-- namespace/project@9ba12248 : for specific commits
-- namespace/project@9ba12248...b19a04f5 : for commit range comparisons
+| input                                   | references              |
+|----------------------------------------:|:------------------------|
+| `namespace/project#123`                 | issue                   |
+| `namespace/project!123`                 | merge request           |
+| `namespace/project$123`                 | snippet                 |
+| `namespace/project@9ba12248`            | specific commit         |
+| `namespace/project@9ba12248...b19a04f5` | commit range comparison |
 
 ## Task Lists
 

From b5802d144b4141b2259247f83903f3431ed6199c Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Fri, 17 Apr 2015 12:34:51 +0200
Subject: [PATCH 51/80] project_from_ref returns nil when reference doesn't
 exist.

---
 lib/gitlab/markdown/cross_project_reference.rb    | 15 ++++++---------
 .../markdown/cross_project_reference_spec.rb      | 10 ++++++++--
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/lib/gitlab/markdown/cross_project_reference.rb b/lib/gitlab/markdown/cross_project_reference.rb
index de05102751f..887c205cdc9 100644
--- a/lib/gitlab/markdown/cross_project_reference.rb
+++ b/lib/gitlab/markdown/cross_project_reference.rb
@@ -16,15 +16,12 @@ module Gitlab
       #
       # Returns a Project, or nil if the reference can't be accessed
       def project_from_ref(ref)
-        if ref && other = Project.find_with_namespace(ref)
-          if user_can_reference_project?(other)
-            other
-          else
-            nil
-          end
-        else
-          context[:project]
-        end
+        return context[:project] unless ref
+
+        other = Project.find_with_namespace(ref)
+        return nil unless other && user_can_reference_project?(other)
+        
+        other
       end
 
       def user_can_reference_project?(project, user = context[:current_user])
diff --git a/spec/lib/gitlab/markdown/cross_project_reference_spec.rb b/spec/lib/gitlab/markdown/cross_project_reference_spec.rb
index d79b2c1af92..4698d6138c2 100644
--- a/spec/lib/gitlab/markdown/cross_project_reference_spec.rb
+++ b/spec/lib/gitlab/markdown/cross_project_reference_spec.rb
@@ -13,9 +13,15 @@ module Gitlab::Markdown
     include described_class
 
     describe '#project_from_ref' do
-      context 'when referenced project does not exist' do
+      context 'when no project was referenced' do
         it 'returns the project from context' do
-          expect(project_from_ref('invalid/reference')).to eq context[:project]
+          expect(project_from_ref(nil)).to eq context[:project]
+        end
+      end
+
+      context 'when referenced project does not exist' do
+        it 'returns nil' do
+          expect(project_from_ref('invalid/reference')).to be_nil
         end
       end
 

From c52bf4ad3cc03aaad4e35236c512bd5c62d45939 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Fri, 17 Apr 2015 14:40:02 +0200
Subject: [PATCH 52/80] Tweak single-word label regex to fix pending spec.

---
 lib/gitlab/markdown/label_reference_filter.rb           | 2 +-
 spec/lib/gitlab/markdown/label_reference_filter_spec.rb | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/gitlab/markdown/label_reference_filter.rb b/lib/gitlab/markdown/label_reference_filter.rb
index f40b981ba60..4c21192c0d3 100644
--- a/lib/gitlab/markdown/label_reference_filter.rb
+++ b/lib/gitlab/markdown/label_reference_filter.rb
@@ -27,7 +27,7 @@ module Gitlab
         ~(
           (?<label_id>\d+)   | # Integer-based label ID, or
           (?<label_name>
-            [^'"&\?,\s]+     | # String-based single-word label title
+            [A-Za-z0-9_-]+   | # String-based single-word label title
             ['"][^&\?,]+['"]   # String-based multi-word label surrounded in quotes
           )
         )
diff --git a/spec/lib/gitlab/markdown/label_reference_filter_spec.rb b/spec/lib/gitlab/markdown/label_reference_filter_spec.rb
index 2258889cb51..c84e568e172 100644
--- a/spec/lib/gitlab/markdown/label_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/label_reference_filter_spec.rb
@@ -84,7 +84,6 @@ module Gitlab::Markdown
       end
 
       it 'links with adjacent text' do
-        skip 'FIXME (rspeicher): This will fail, because a period and parentheses are both currently valid in label names.'
         doc = filter("Label (#{reference}.)")
         expect(doc.to_html).to match(%r(\(<a.+><span.+>#{label.name}</span></a>\.\)))
       end

From b38942462792f896dace358c7fe32cd7c159e793 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 20 Apr 2015 13:01:11 -0400
Subject: [PATCH 53/80] Skip failing test until usernames can't end in periods
 again

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

diff --git a/spec/lib/gitlab/markdown/user_reference_filter_spec.rb b/spec/lib/gitlab/markdown/user_reference_filter_spec.rb
index 1704c826d5d..a5eb927072e 100644
--- a/spec/lib/gitlab/markdown/user_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/user_reference_filter_spec.rb
@@ -65,6 +65,7 @@ module Gitlab::Markdown
     end
 
     it 'links with adjacent text' do
+      skip 'TODO (rspeicher): Re-enable when usernames can\'t end in periods.'
       doc = filter("Mention me (@#{user.username}.)")
       expect(doc.to_html).to match(/\(<a.+>@#{user.username}<\/a>\.\)/)
     end

From 6fb1e80a2622a13f316ec056fc7b17ebf79ef1ef Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Mon, 20 Apr 2015 11:05:51 -0700
Subject: [PATCH 54/80] Fix "Cannot move project" error message from popping up
 after a successful project transfer

Multiple event handlers were firing, causing multiple form submissions.

Closes #1448 and #1128
---
 CHANGELOG                                             | 2 +-
 app/assets/javascripts/application.js.coffee          | 1 +
 app/assets/javascripts/confirm_danger_modal.js.coffee | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index be96d712439..9b7863826c0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,7 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date.
 v 7.11.0 (unreleased)
   - Fix clone URL field and X11 Primary selection (Dmitry Medvinsky)
   - Ignore invalid lines in .gitmodules
-  -
+  - Fix "Cannot move project" error message from popping up after a successful transfer (Stan Hu)
   -
   -
   -
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index bd52d3d4d70..345af363775 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -173,6 +173,7 @@ $ ->
     $(@).closest(".diff-file").find(".notes_holder").toggle()
     e.preventDefault()
 
+  $(document).off "click", '.js-confirm-danger'
   $(document).on "click", '.js-confirm-danger', (e) ->
     e.preventDefault()
     btn = $(e.target)
diff --git a/app/assets/javascripts/confirm_danger_modal.js.coffee b/app/assets/javascripts/confirm_danger_modal.js.coffee
index bb99edbd09e..66e34dd4a08 100644
--- a/app/assets/javascripts/confirm_danger_modal.js.coffee
+++ b/app/assets/javascripts/confirm_danger_modal.js.coffee
@@ -8,11 +8,13 @@ class @ConfirmDangerModal
     submit = $('.js-confirm-danger-submit')
     submit.disable()
 
+    $('.js-confirm-danger-input').off 'input'
     $('.js-confirm-danger-input').on 'input', ->
       if rstrip($(@).val()) is project_path
         submit.enable()
       else
         submit.disable()
 
+    $('.js-confirm-danger-submit').off 'click'
     $('.js-confirm-danger-submit').on 'click', =>
       @form.submit()

From 355e6868a2bc8bee42fa5e070c14d2b00ec1fe81 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Tue, 21 Apr 2015 10:30:07 +0200
Subject: [PATCH 55/80] Fix redirect when trying to view invalid Google Code
 import status.

---
 app/controllers/import/google_code_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/import/google_code_controller.rb b/app/controllers/import/google_code_controller.rb
index 73c912e285b..6574be91920 100644
--- a/app/controllers/import/google_code_controller.rb
+++ b/app/controllers/import/google_code_controller.rb
@@ -68,7 +68,7 @@ class Import::GoogleCodeController < Import::BaseController
 
   def status
     unless client.valid?
-      return redirect_to new_import_google_path 
+      return redirect_to new_import_google_code_path 
     end
 
     @repos = client.repos

From 96c03199dddf36cbd0e2ad4089be535d73b26adc Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Tue, 21 Apr 2015 10:30:23 +0200
Subject: [PATCH 56/80] Add "imported from Google Code" to imported issues.

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

diff --git a/lib/gitlab/google_code_import/importer.rb b/lib/gitlab/google_code_import/importer.rb
index b5e82563ff1..5c7ac7fc4b7 100644
--- a/lib/gitlab/google_code_import/importer.rb
+++ b/lib/gitlab/google_code_import/importer.rb
@@ -340,7 +340,7 @@ module Gitlab
 
       def format_issue_body(author, date, content, attachments)
         body = []
-        body << "*By #{author} on #{date}*"
+        body << "*By #{author} on #{date} (imported from Google Code)*"
         body << "---"
 
         if content.blank?

From c242ca9a177c0a101e2a02541830ffe56a1ae23e Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Tue, 21 Apr 2015 10:31:15 +0200
Subject: [PATCH 57/80] Get imported links to render correctly by not escaping
 all special chars.

---
 lib/gitlab/google_code_import/importer.rb | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/lib/gitlab/google_code_import/importer.rb b/lib/gitlab/google_code_import/importer.rb
index 5c7ac7fc4b7..3916e51d0ab 100644
--- a/lib/gitlab/google_code_import/importer.rb
+++ b/lib/gitlab/google_code_import/importer.rb
@@ -207,21 +207,19 @@ module Gitlab
       end
 
       def escape_for_markdown(s)
-        s = s.gsub("*", "\\*")
-        s = s.gsub("#", "\\#")
+        # No headings and lists
+        s = s.gsub(/^#/, "\\#")
+        s = s.gsub(/^-/, "\\-")
+
+        # No inline code
         s = s.gsub("`", "\\`")
-        s = s.gsub(":", "\\:")
-        s = s.gsub("-", "\\-")
-        s = s.gsub("+", "\\+")
-        s = s.gsub("_", "\\_")
-        s = s.gsub("(", "\\(")
-        s = s.gsub(")", "\\)")
-        s = s.gsub("[", "\\[")
-        s = s.gsub("]", "\\]")
-        s = s.gsub("<", "\\<")
-        s = s.gsub(">", "\\>")
+
+        # Carriage returns make me sad
         s = s.gsub("\r", "")
+
+        # Markdown ignores single newlines, but we need them as <br />.
         s = s.gsub("\n", "  \n")
+
         s
       end
 

From bc2dd5e772dea3ec78462441413842f9fe82165a Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Tue, 21 Apr 2015 10:31:50 +0200
Subject: [PATCH 58/80] Import "Comment #10" as "Comment 10" to not incorrectly
 reference issue.

---
 lib/gitlab/google_code_import/importer.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/gitlab/google_code_import/importer.rb b/lib/gitlab/google_code_import/importer.rb
index 3916e51d0ab..caa57f557c0 100644
--- a/lib/gitlab/google_code_import/importer.rb
+++ b/lib/gitlab/google_code_import/importer.rb
@@ -203,7 +203,9 @@ module Gitlab
       end
 
       def linkify_issues(s)
-        s.gsub(/([Ii]ssue) ([0-9]+)/, '\1 #\2')
+        s = s.gsub(/([Ii]ssue) ([0-9]+)/, '\1 #\2')
+        s = s.gsub(/([Cc]omment) #([0-9]+)/, '\1 \2')
+        s
       end
 
       def escape_for_markdown(s)

From 18f80c55600e485c87d23afccd82b4947e27ff17 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Tue, 21 Apr 2015 10:32:29 +0200
Subject: [PATCH 59/80] Fix rendering of deleted blocking/blocked-on statuses.

---
 lib/gitlab/google_code_import/importer.rb | 34 ++++++++++++++++-------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/lib/gitlab/google_code_import/importer.rb b/lib/gitlab/google_code_import/importer.rb
index caa57f557c0..532689bca6c 100644
--- a/lib/gitlab/google_code_import/importer.rb
+++ b/lib/gitlab/google_code_import/importer.rb
@@ -276,11 +276,18 @@ module Gitlab
         if raw_updates.has_key?("blockedOn")
           blocked_ons = raw_updates["blockedOn"].map do |raw_blocked_on|
             name, id = raw_blocked_on.split(":", 2)
-            if name == project.import_source
-              "##{id}"
-            else
-              "#{project.namespace.path}/#{name}##{id}"
-            end
+
+            deleted = name.start_with?("-") 
+            name = name[1..-1] if deleted
+
+            text =
+              if name == project.import_source
+                "##{id}"
+              else
+                "#{project.namespace.path}/#{name}##{id}"
+              end
+            text = "~~#{text}~~" if deleted
+            text
           end
           updates << "*Blocked on: #{blocked_ons.join(", ")}*"
         end
@@ -288,11 +295,18 @@ module Gitlab
         if raw_updates.has_key?("blocking")
           blockings = raw_updates["blocking"].map do |raw_blocked_on|
             name, id = raw_blocked_on.split(":", 2)
-            if name == project.import_source
-              "##{id}"
-            else
-              "#{project.namespace.path}/#{name}##{id}"
-            end
+            
+            deleted = name.start_with?("-") 
+            name = name[1..-1] if deleted
+
+            text =
+              if name == project.import_source
+                "##{id}"
+              else
+                "#{project.namespace.path}/#{name}##{id}"
+              end
+            text = "~~#{text}~~" if deleted
+            text
           end
           updates << "*Blocking: #{blockings.join(", ")}*"
         end

From 1c30f775995378082942f4c7c8c2f7bdc11e48a9 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Tue, 21 Apr 2015 10:32:48 +0200
Subject: [PATCH 60/80] Don't autolink masked imported email addresses.

---
 lib/gitlab/google_code_import/importer.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/gitlab/google_code_import/importer.rb b/lib/gitlab/google_code_import/importer.rb
index 532689bca6c..70bfe059776 100644
--- a/lib/gitlab/google_code_import/importer.rb
+++ b/lib/gitlab/google_code_import/importer.rb
@@ -30,7 +30,10 @@ module Gitlab
 
       def user_map
         @user_map ||= begin
-          user_map = Hash.new { |hash, user| Client.mask_email(user) }
+          user_map = Hash.new do |hash, user| 
+            # Replace ... by \.\.\., so `johnsm...@gmail.com` isn't autolinked.
+            Client.mask_email(user).sub("...", "\\.\\.\\.")
+          end
 
           import_data = project.import_data.try(:data)
           stored_user_map = import_data["user_map"] if import_data

From 1419e94816396d699777ab220e3625429bd40b68 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Tue, 21 Apr 2015 10:33:04 +0200
Subject: [PATCH 61/80] Improve description of Google Code import user map.

---
 .../import/google_code/new_user_map.html.haml | 28 +++++++++++++++++--
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/app/views/import/google_code/new_user_map.html.haml b/app/views/import/google_code/new_user_map.html.haml
index d55fcfc97a8..9c6824ecad7 100644
--- a/app/views/import/google_code/new_user_map.html.haml
+++ b/app/views/import/google_code/new_user_map.html.haml
@@ -8,9 +8,31 @@
     Customize how Google Code email addresses and usernames are imported into GitLab.
     In the next step, you'll be able to select the projects you want to import.
   %p 
-    The user map is a JSON document mapping Google Code users (as keys) to the way they will be imported into GitLab (as values). By default the username is masked to ensure users' privacy.
-  %p
-    To map a Google Code user to a full name or GitLab user, simply replace the value, e.g. <code>"johnsmith@gmail.com": "John Smith"</code> or <code>"johnsmith@gmail.com": "@johnsmith"</code>. Be sure to preserve the surrounding double quotes and other punctuation.
+    The user map is a JSON document mapping the Google Code users that participated on your projects to the way their email addresses and usernames will be imported into GitLab. You can change this by changing the value on the right hand side of <code>:</code>. Be sure to preserve the surrounding double quotes, other punctuation and the email address or username on the left hand side.
+  %ul
+    %li
+      %strong Default: Directly import the Google Code email address or username
+      %p
+        <code>"johnsmith@example.com": "johnsm...@example.com"</code> 
+        will add "By johnsm...@example.com" to all issues and comments originally created by johnsmith@example.com. 
+        The email address or username is masked to ensure the user's privacy.
+    %li
+      %strong Map a Google Code user to a GitLab user
+      %p
+        <code>"johnsmith@example.com": "@johnsmith"</code> 
+        will add "By <a href="#">@johnsmith</a>" to all issues and comments originally created by johnsmith@example.com, 
+        and will set <a href="#">@johnsmith</a> as the assignee on all issues originally assigned to johnsmith@example.com.
+    %li
+      %strong Map a Google Code user to a full name
+      %p
+        <code>"johnsmith@example.com": "John Smith"</code> 
+        will add "By John Smith" to all issues and comments originally created by johnsmith@example.com.
+    %li
+      %strong Map a Google Code user to a full email address
+      %p
+        <code>"johnsmith@example.com": "johnsmith@example.com"</code> 
+        will add "By <a href="#">johnsmith@example.com</a>" to all issues and comments originally created by johnsmith@example.com. 
+        By default, the email address or username is masked to ensure the user's privacy. Use this option if you want to show the full email address.
 
   .form-group
     .col-sm-12

From 0c650dc0e2d030b6cfd39bbe25f88c5e349f5c70 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Tue, 21 Apr 2015 10:35:53 +0200
Subject: [PATCH 62/80] Update Google Code importer test.

---
 spec/lib/gitlab/google_code_import/importer_spec.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/spec/lib/gitlab/google_code_import/importer_spec.rb b/spec/lib/gitlab/google_code_import/importer_spec.rb
index 1c4503ae0ef..67378328336 100644
--- a/spec/lib/gitlab/google_code_import/importer_spec.rb
+++ b/spec/lib/gitlab/google_code_import/importer_spec.rb
@@ -57,10 +57,11 @@ describe Gitlab::GoogleCodeImport::Importer do
       expect(issue.label_names).to include("Type: Enhancement")
       expect(issue.title).to eq("Scrolling through tasks")
       expect(issue.state).to eq("closed")
-      expect(issue.description).to include("schattenpr...")
+      expect(issue.description).to include("schattenpr\\.\\.\\.")
       expect(issue.description).to include("November 18, 2009 00:20")
-      expect(issue.description).to include('I like to scroll through the tasks with my scrollwheel \(like in fluxbox\).')
-      expect(issue.description).to include('Patch is attached that adds two new mouse\-actions \(next\_taskprev\_task\)')
+      expect(issue.description).to include("Google Code")
+      expect(issue.description).to include('I like to scroll through the tasks with my scrollwheel (like in fluxbox).')
+      expect(issue.description).to include('Patch is attached that adds two new mouse-actions (next_task+prev_task)')
       expect(issue.description).to include('that can be used for exactly that purpose.')
       expect(issue.description).to include('all the best!')
       expect(issue.description).to include('[tint2_task_scrolling.diff](https://storage.googleapis.com/google-code-attachments/tint2/issue-169/comment-0/tint2_task_scrolling.diff)')

From c7dc95d1d1f9360c0215ffe28404c04a03689bfa Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Tue, 21 Apr 2015 11:00:26 +0200
Subject: [PATCH 63/80] 7.10 requires gitlab-shell 2.6.2.

---
 doc/update/6.x-or-7.x-to-7.10.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/update/6.x-or-7.x-to-7.10.md b/doc/update/6.x-or-7.x-to-7.10.md
index 2ee9a07cee3..39e12f32d0e 100644
--- a/doc/update/6.x-or-7.x-to-7.10.md
+++ b/doc/update/6.x-or-7.x-to-7.10.md
@@ -126,7 +126,7 @@ sudo apt-get install nodejs
 ```bash
 cd /home/git/gitlab-shell
 sudo -u git -H git fetch
-sudo -u git -H git checkout v2.6.0
+sudo -u git -H git checkout v2.6.2
 ```
 
 ## 7. Install libs, migrations, etc.

From 837dc328bf1632e80de4c288a13eb22661177ca5 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Thu, 16 Apr 2015 16:41:51 -0400
Subject: [PATCH 64/80] Change html-pipeline-gitlab gem to html-pipeline

---
 Gemfile      | 2 +-
 Gemfile.lock | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index 11407ca8e77..3c42885ef80 100644
--- a/Gemfile
+++ b/Gemfile
@@ -88,7 +88,7 @@ gem "six"
 gem "seed-fu"
 
 # Markup pipeline for GitLab
-gem 'html-pipeline-gitlab', '~> 0.1'
+gem 'html-pipeline', '~> 1.11.0'
 
 # Markdown to HTML
 gem "github-markup"
diff --git a/Gemfile.lock b/Gemfile.lock
index a134fbf6bf4..8f66476ad63 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -278,12 +278,6 @@ GEM
     html-pipeline (1.11.0)
       activesupport (>= 2)
       nokogiri (~> 1.4)
-    html-pipeline-gitlab (0.2.0)
-      actionpack (~> 4)
-      gitlab_emoji (~> 0.1)
-      html-pipeline (~> 1.11.0)
-      mime-types
-      sanitize (~> 2.1)
     http_parser.rb (0.5.3)
     httparty (0.13.3)
       json (~> 1.8)
@@ -717,7 +711,7 @@ DEPENDENCIES
   guard-spinach
   haml-rails
   hipchat (~> 1.5.0)
-  html-pipeline-gitlab (~> 0.1)
+  html-pipeline (~> 1.11.0)
   httparty
   jasmine (= 2.0.2)
   jquery-atwho-rails (~> 0.3.3)

From 4ced630fed7cc057e66f2c795ebca17a5d6a22e6 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Thu, 16 Apr 2015 17:38:01 -0400
Subject: [PATCH 65/80] Add Gitlab::Markdown::EmojiFilter

---
 lib/gitlab/markdown/emoji_filter.rb           | 79 +++++++++++++++
 spec/lib/gitlab/markdown/emoji_filter_spec.rb | 97 +++++++++++++++++++
 2 files changed, 176 insertions(+)
 create mode 100644 lib/gitlab/markdown/emoji_filter.rb
 create mode 100644 spec/lib/gitlab/markdown/emoji_filter_spec.rb

diff --git a/lib/gitlab/markdown/emoji_filter.rb b/lib/gitlab/markdown/emoji_filter.rb
new file mode 100644
index 00000000000..e239f766844
--- /dev/null
+++ b/lib/gitlab/markdown/emoji_filter.rb
@@ -0,0 +1,79 @@
+require 'gitlab_emoji'
+require 'html/pipeline/filter'
+require 'action_controller'
+
+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
+        doc.search('text()').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/spec/lib/gitlab/markdown/emoji_filter_spec.rb b/spec/lib/gitlab/markdown/emoji_filter_spec.rb
new file mode 100644
index 00000000000..18d55c4818f
--- /dev/null
+++ b/spec/lib/gitlab/markdown/emoji_filter_spec.rb
@@ -0,0 +1,97 @@
+require 'spec_helper'
+
+module Gitlab::Markdown
+  describe EmojiFilter do
+    def filter(html, contexts = {})
+      described_class.call(html, contexts)
+    end
+
+    before do
+      ActionController::Base.asset_host = 'https://foo.com'
+    end
+
+    it 'replaces supported emoji' do
+      doc = filter('<p>:heart:</p>')
+      expect(doc.css('img').first.attr('src')).to eq 'https://foo.com/assets/emoji/2764.png'
+    end
+
+    it 'ignores unsupported emoji' do
+      exp = act = '<p>:foo:</p>'
+      doc = filter(act)
+      expect(doc.to_html).to match Regexp.escape(exp)
+    end
+
+    it 'correctly encodes the URL' do
+      doc = filter('<p>:+1:</p>')
+      expect(doc.css('img').first.attr('src')).to eq 'https://foo.com/assets/emoji/1F44D.png'
+    end
+
+    it 'matches at the start of a string' do
+      doc = filter(':+1:')
+      expect(doc.css('img').size).to eq 1
+    end
+
+    it 'matches at the end of a string' do
+      doc = filter('This gets a :-1:')
+      expect(doc.css('img').size).to eq 1
+    end
+
+    it 'matches with adjacent text' do
+      doc = filter('+1 (:+1:)')
+      expect(doc.css('img').size).to eq 1
+    end
+
+    it 'matches multiple emoji in a row' do
+      doc = filter(':see_no_evil::hear_no_evil::speak_no_evil:')
+      expect(doc.css('img').size).to eq 3
+    end
+
+    it 'has a title attribute' do
+      doc = filter(':-1:')
+      expect(doc.css('img').first.attr('title')).to eq ':-1:'
+    end
+
+    it 'has an alt attribute' do
+      doc = filter(':-1:')
+      expect(doc.css('img').first.attr('alt')).to eq ':-1:'
+    end
+
+    it 'has an align attribute' do
+      doc = filter(':8ball:')
+      expect(doc.css('img').first.attr('align')).to eq 'absmiddle'
+    end
+
+    it 'has an emoji class' do
+      doc = filter(':cat:')
+      expect(doc.css('img').first.attr('class')).to eq 'emoji'
+    end
+
+    it 'has height and width attributes' do
+      doc = filter(':dog:')
+      img = doc.css('img').first
+
+      expect(img.attr('width')).to eq '20'
+      expect(img.attr('height')).to eq '20'
+    end
+
+    it 'keeps whitespace intact' do
+      doc = filter('This deserves a :+1:, big time.')
+
+      expect(doc.to_html).to match(/^This deserves a <img.+>, big time\.\z/)
+    end
+
+    it 'uses a custom asset_root context' do
+      root = Gitlab.config.gitlab.url + 'gitlab/root'
+
+      doc = filter(':smile:', asset_root: root)
+      expect(doc.css('img').first.attr('src')).to start_with(root)
+    end
+
+    it 'uses a custom asset_host context' do
+      ActionController::Base.asset_host = 'https://cdn.example.com'
+
+      doc = filter(':frowning:', asset_host: 'https://this-is-ignored-i-guess?')
+      expect(doc.css('img').first.attr('src')).to start_with('https://cdn.example.com')
+    end
+  end
+end

From fca624670ac212d4241fa262dbaf1f908e7658b9 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Thu, 16 Apr 2015 17:39:09 -0400
Subject: [PATCH 66/80] Update Gitlab::Markdown to use the :new: EmojiFilter
 :sparkles:

Removes emoji-centric tests from GFM specs :boom:
---
 lib/gitlab/markdown.rb                      | 28 ++++----
 spec/helpers/gitlab_markdown_helper_spec.rb | 76 +--------------------
 2 files changed, 18 insertions(+), 86 deletions(-)

diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb
index f2302015437..37b250d353e 100644
--- a/lib/gitlab/markdown.rb
+++ b/lib/gitlab/markdown.rb
@@ -1,5 +1,4 @@
 require 'html/pipeline'
-require 'html/pipeline/gitlab'
 
 module Gitlab
   # Custom parser for GitLab-flavored Markdown
@@ -61,19 +60,24 @@ module Gitlab
         reference_only_path:  true
       )
 
-      markdown_context = {
+      pipeline = HTML::Pipeline.new(filters)
+
+      context = {
+        # SanitizationFilter
+        whitelist:       sanitization_whitelist,
+
+        # EmojiFilter
         asset_root:      Gitlab.config.gitlab.url,
         asset_host:      Gitlab::Application.config.asset_host,
-        whitelist:       sanitization_whitelist,
-        reference_class: html_options[:class],
-        only_path:       options[:reference_only_path],
+
+        # ReferenceFilter
         current_user:    current_user,
-        project:         project
+        only_path:       options[:reference_only_path],
+        project:         project,
+        reference_class: html_options[:class]
       }
 
-      markdown_pipeline = HTML::Pipeline::Gitlab.new(filters).pipeline
-
-      result = markdown_pipeline.call(text, markdown_context)
+      result = pipeline.call(text, context)
 
       save_options = 0
       if options[:xhtml]
@@ -91,7 +95,7 @@ module Gitlab
 
     private
 
-    # Custom filters for html-pipeline:
+    # Filters used in our pipeline
     #
     # SanitizationFilter should come first so that all generated reference HTML
     # goes through untouched.
@@ -101,6 +105,8 @@ module Gitlab
       [
         HTML::Pipeline::SanitizationFilter,
 
+        Gitlab::Markdown::EmojiFilter,
+
         Gitlab::Markdown::UserReferenceFilter,
         Gitlab::Markdown::IssueReferenceFilter,
         Gitlab::Markdown::ExternalIssueReferenceFilter,
@@ -109,8 +115,6 @@ module Gitlab
         Gitlab::Markdown::CommitRangeReferenceFilter,
         Gitlab::Markdown::CommitReferenceFilter,
         Gitlab::Markdown::LabelReferenceFilter,
-
-        HTML::Pipeline::Gitlab::GitlabEmojiFilter
       ]
     end
 
diff --git a/spec/helpers/gitlab_markdown_helper_spec.rb b/spec/helpers/gitlab_markdown_helper_spec.rb
index 315e91d4f35..60e000b4ddd 100644
--- a/spec/helpers/gitlab_markdown_helper_spec.rb
+++ b/spec/helpers/gitlab_markdown_helper_spec.rb
@@ -10,15 +10,12 @@ describe GitlabMarkdownHelper do
   end
 
   let!(:project) { create(:project) }
-  let(:empty_project) { create(:empty_project) }
 
   let(:user)          { create(:user, username: 'gfm') }
   let(:commit)        { project.repository.commit }
-  let(:earlier_commit){ project.repository.commit("HEAD~2") }
   let(:issue)         { create(:issue, project: project) }
   let(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
   let(:snippet)       { create(:project_snippet, project: project) }
-  let(:member)        { project.project_members.where(user_id: user).first }
 
   # Helper expects a current_user method.
   let(:current_user) { user }
@@ -60,53 +57,6 @@ describe GitlabMarkdownHelper do
       end
     end
 
-    # TODO (rspeicher): These tests belong in the emoji filter spec
-    describe "emoji" do
-      it "matches at the start of a string" do
-        expect(gfm(":+1:")).to match(/<img/)
-      end
-
-      it "matches at the end of a string" do
-        expect(gfm("This gets a :-1:")).to match(/<img/)
-      end
-
-      it "matches with adjacent text" do
-        expect(gfm("+1 (:+1:)")).to match(/<img/)
-      end
-
-      it "has a title attribute" do
-        expect(gfm(":-1:")).to match(/title=":-1:"/)
-      end
-
-      it "has an alt attribute" do
-        expect(gfm(":-1:")).to match(/alt=":-1:"/)
-      end
-
-      it "has an emoji class" do
-        expect(gfm(":+1:")).to match('class="emoji"')
-      end
-
-      it "sets height and width" do
-        actual = gfm(":+1:")
-        expect(actual).to match(/width="20"/)
-        expect(actual).to match(/height="20"/)
-      end
-
-      it "keeps whitespace intact" do
-        expect(gfm('This deserves a :+1: big time.')).
-          to match(/deserves a <img.+> big time/)
-      end
-
-      it "ignores invalid emoji" do
-        expect(gfm(":invalid-emoji:")).not_to match(/<img/)
-      end
-
-      it "should work independent of reference links (i.e. without @project being set)" do
-        @project = nil
-        expect(gfm(":+1:")).to match(/<img/)
-      end
-    end
-
     context 'parse_tasks: true' do
       before(:all) do
         @source_text_asterisk = <<-EOT.strip_heredoc
@@ -339,28 +289,6 @@ describe GitlabMarkdownHelper do
       expect(markdown("##{issue.iid}")).to include(namespace_project_issue_path(project.namespace, project, issue))
     end
 
-    # EMOJI -------------------------------------------------------------------
-
-    it "should generate absolute urls for emoji" do
-      # TODO (rspeicher): Why isn't this with the emoji tests?
-      expect(markdown(':smile:')).to(
-        include(%(src="#{Gitlab.config.gitlab.url}/assets/emoji/#{Emoji.emoji_filename('smile')}.png))
-      )
-    end
-
-    it "should generate absolute urls for emoji if relative url is present" do
-      # TODO (rspeicher): Why isn't this with the emoji tests?
-      allow(Gitlab.config.gitlab).to receive(:url).and_return('http://localhost/gitlab/root')
-      expect(markdown(":smile:")).to include("src=\"http://localhost/gitlab/root/assets/emoji/#{Emoji.emoji_filename('smile')}.png")
-    end
-
-    it "should generate absolute urls for emoji if asset_host is present" do
-      # TODO (rspeicher): Why isn't this with the emoji tests?
-      allow(Gitlab::Application.config).to receive(:asset_host).and_return("https://cdn.example.com")
-      ActionView::Base.any_instance.stub_chain(:config, :asset_host).and_return("https://cdn.example.com")
-      expect(markdown(":smile:")).to include("src=\"https://cdn.example.com/assets/emoji/#{Emoji.emoji_filename('smile')}.png")
-    end
-
     # RELATIVE URLS -----------------------------------------------------------
     # TODO (rspeicher): These belong in a relative link filter spec
 
@@ -448,8 +376,8 @@ describe GitlabMarkdownHelper do
   # TODO (rspeicher): This should be a context of relative link specs, not its own thing
   describe 'markdown for empty repository' do
     before do
-      @project = empty_project
-      @repository = empty_project.repository
+      @project = create(:empty_project)
+      @repository = @project.repository
     end
 
     it "should not touch relative urls" do

From f9c0f0782ba67deab797e7a987038c502bed6751 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 20 Apr 2015 15:43:27 -0400
Subject: [PATCH 67/80] Use Nokogiri in `link_to_gfm` specs

Didn't like relying so much on Regex matches
---
 spec/helpers/gitlab_markdown_helper_spec.rb | 42 +++++++++++----------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/spec/helpers/gitlab_markdown_helper_spec.rb b/spec/helpers/gitlab_markdown_helper_spec.rb
index 60e000b4ddd..11840a49e14 100644
--- a/spec/helpers/gitlab_markdown_helper_spec.rb
+++ b/spec/helpers/gitlab_markdown_helper_spec.rb
@@ -168,43 +168,45 @@ describe GitlabMarkdownHelper do
     end
   end
 
-  describe "#link_to_gfm" do
+  describe '#link_to_gfm' do
     let(:commit_path) { namespace_project_commit_path(project.namespace, project, commit) }
     let(:issues)      { create_list(:issue, 2, project: project) }
 
-    it "should handle references nested in links with all the text" do
+    it 'should handle references nested in links with all the text' do
       actual = link_to_gfm("This should finally fix ##{issues[0].iid} and ##{issues[1].iid} for real", commit_path)
-
-      # Break the result into groups of links with their content, without
-      # closing tags
-      groups = actual.split("</a>")
+      doc = Nokogiri::HTML.parse(actual)
 
       # Leading commit link
-      expect(groups[0]).to match(/href="#{commit_path}"/)
-      expect(groups[0]).to match(/This should finally fix $/)
+      expect(doc.css('a')[0].attr('href')).to eq commit_path
+      expect(doc.css('a')[0].text).to eq 'This should finally fix '
 
       # First issue link
-      expect(groups[1]).
-        to match(/href="#{namespace_project_issue_path(project.namespace, project, issues[0])}"/)
-      expect(groups[1]).to match(/##{issues[0].iid}$/)
+      expect(doc.css('a')[1].attr('href')).
+        to eq namespace_project_issue_path(project.namespace, project, issues[0])
+      expect(doc.css('a')[1].text).to eq "##{issues[0].iid}"
 
       # Internal commit link
-      expect(groups[2]).to match(/href="#{commit_path}"/)
-      expect(groups[2]).to match(/ and /)
+      expect(doc.css('a')[2].attr('href')).to eq commit_path
+      expect(doc.css('a')[2].text).to eq ' and '
 
       # Second issue link
-      expect(groups[3]).
-        to match(/href="#{namespace_project_issue_path(project.namespace, project, issues[1])}"/)
-      expect(groups[3]).to match(/##{issues[1].iid}$/)
+      expect(doc.css('a')[3].attr('href')).
+        to eq namespace_project_issue_path(project.namespace, project, issues[1])
+      expect(doc.css('a')[3].text).to eq "##{issues[1].iid}"
 
       # Trailing commit link
-      expect(groups[4]).to match(/href="#{commit_path}"/)
-      expect(groups[4]).to match(/ for real$/)
+      expect(doc.css('a')[4].attr('href')).to eq commit_path
+      expect(doc.css('a')[4].text).to eq ' for real'
     end
 
-    it "should forward HTML options" do
+    it 'should forward HTML options' do
       actual = link_to_gfm("Fixed in #{commit.id}", commit_path, class: 'foo')
-      expect(actual).to have_selector 'a.gfm.gfm-commit.foo'
+      doc = Nokogiri::HTML.parse(actual)
+
+      expect(doc.css('a')).to satisfy do |v|
+        # 'foo' gets added to all links
+        v.all? { |a| a.attr('class').match(/foo$/) }
+      end
     end
 
     it "escapes HTML passed in as the body" do

From 870969a1b28e129f5ba73539528e81273b7e7b40 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Tue, 21 Apr 2015 13:12:19 -0400
Subject: [PATCH 68/80] More cleanup of gitlab_markdown_helper_spec

---
 spec/helpers/gitlab_markdown_helper_spec.rb | 176 ++++++++++----------
 1 file changed, 85 insertions(+), 91 deletions(-)

diff --git a/spec/helpers/gitlab_markdown_helper_spec.rb b/spec/helpers/gitlab_markdown_helper_spec.rb
index 11840a49e14..64f130e4ae4 100644
--- a/spec/helpers/gitlab_markdown_helper_spec.rb
+++ b/spec/helpers/gitlab_markdown_helper_spec.rb
@@ -2,12 +2,6 @@ require 'spec_helper'
 
 describe GitlabMarkdownHelper do
   include ApplicationHelper
-  include IssuesHelper
-
-  # TODO: Properly test this
-  def can?(*)
-    true
-  end
 
   let!(:project) { create(:project) }
 
@@ -20,22 +14,15 @@ describe GitlabMarkdownHelper do
   # Helper expects a current_user method.
   let(:current_user) { user }
 
-  def url_helper(image_name)
-    File.join(root_url, 'assets', image_name)
-  end
-
   before do
     # Helper expects a @project instance variable
     @project = project
-    @ref = 'markdown'
-    @repository = project.repository
-    @request.host = Gitlab.config.gitlab.host
   end
 
   describe "#gfm" do
     it "should forward HTML options to links" do
       expect(gfm("Fixed in #{commit.id}", @project, class: 'foo')).
-          to have_selector('a.gfm.foo')
+        to have_selector('a.gfm.foo')
     end
 
     describe "referencing multiple objects" do
@@ -176,6 +163,9 @@ describe GitlabMarkdownHelper do
       actual = link_to_gfm("This should finally fix ##{issues[0].iid} and ##{issues[1].iid} for real", commit_path)
       doc = Nokogiri::HTML.parse(actual)
 
+      # Make sure we didn't create invalid markup
+      expect(doc.errors).to be_empty
+
       # Leading commit link
       expect(doc.css('a')[0].attr('href')).to eq commit_path
       expect(doc.css('a')[0].text).to eq 'This should finally fix '
@@ -219,17 +209,6 @@ describe GitlabMarkdownHelper do
   describe "#markdown" do
     # TODO (rspeicher) - This block tests multiple different contexts. Break this up!
 
-    # REFERENCES (PART TWO: THE REVENGE) ---------------------------------------
-
-    it "should handle references in headers" do
-      actual = "\n# Working around ##{issue.iid}\n## Apply !#{merge_request.iid}"
-
-      expect(markdown(actual, no_header_anchors: true)).
-        to match(%r{<h1[^<]*>Working around <a.+>##{issue.iid}</a></h1>})
-      expect(markdown(actual, no_header_anchors: true)).
-        to match(%r{<h2[^<]*>Apply <a.+>!#{merge_request.iid}</a></h2>})
-    end
-
     it "should add ids and links to headers" do
       # Test every rule except nested tags.
       text = '..Ab_c-d. e..'
@@ -245,6 +224,17 @@ describe GitlabMarkdownHelper do
       )
     end
 
+    # REFERENCES (PART TWO: THE REVENGE) ---------------------------------------
+
+    it "should handle references in headers" do
+      actual = "\n# Working around ##{issue.iid}\n## Apply !#{merge_request.iid}"
+
+      expect(markdown(actual, no_header_anchors: true)).
+        to match(%r{<h1[^<]*>Working around <a.+>##{issue.iid}</a></h1>})
+      expect(markdown(actual, no_header_anchors: true)).
+        to match(%r{<h2[^<]*>Apply <a.+>!#{merge_request.iid}</a></h2>})
+    end
+
     it "should handle references in <em>" do
       actual = "Apply _!#{merge_request.iid}_ ASAP"
 
@@ -260,16 +250,15 @@ describe GitlabMarkdownHelper do
 
       target_html = "<pre class=\"code highlight white plaintext\"><code>some code from $#{snippet.id}\nhere too\n</code></pre>\n"
 
-      expect(helper.markdown("\n    some code from $#{snippet.id}\n    here too\n")).
+      expect(markdown("\n    some code from $#{snippet.id}\n    here too\n")).
         to eq(target_html)
-      expect(helper.markdown("\n```\nsome code from $#{snippet.id}\nhere too\n```\n")).
+      expect(markdown("\n```\nsome code from $#{snippet.id}\nhere too\n```\n")).
         to eq(target_html)
     end
 
     it "should leave inline code untouched" do
-      expect(markdown("\nDon't use `$#{snippet.id}` here.\n")).to eq(
-        "<p>Don't use <code>$#{snippet.id}</code> here.</p>\n"
-      )
+      expect(markdown("Don't use `$#{snippet.id}` here.")).
+        to eq "<p>Don't use <code>$#{snippet.id}</code> here.</p>\n"
     end
 
     # REF-LIKE AUTOLINKS? -----------------------------------------------------
@@ -287,67 +276,86 @@ describe GitlabMarkdownHelper do
       expect(markdown("screen shot: ![some image](http://example.tld/#!#{merge_request.iid})")).to eq("<p>screen shot: <img src=\"http://example.tld/#!#{merge_request.iid}\" alt=\"some image\"></p>\n")
     end
 
-    it "should generate absolute urls for refs" do
-      expect(markdown("##{issue.iid}")).to include(namespace_project_issue_path(project.namespace, project, issue))
-    end
-
     # RELATIVE URLS -----------------------------------------------------------
     # TODO (rspeicher): These belong in a relative link filter spec
 
-    it "should handle relative urls for a file in master" do
-      actual = "[GitLab API doc](doc/api/README.md)\n"
-      expected = "<p><a href=\"/#{project.path_with_namespace}/blob/#{@ref}/doc/api/README.md\">GitLab API doc</a></p>\n"
-      expect(markdown(actual)).to match(expected)
-    end
+    context 'relative links' do
+      context 'with a valid repository' do
+        before do
+          @repository = project.repository
+          @ref = 'markdown'
+        end
 
-    it "should handle relative urls for a file in master with an anchor" do
-      actual = "[GitLab API doc](doc/api/README.md#section)\n"
-      expected = "<p><a href=\"/#{project.path_with_namespace}/blob/#{@ref}/doc/api/README.md#section\">GitLab API doc</a></p>\n"
-      expect(markdown(actual)).to match(expected)
-    end
+        it "should handle relative urls for a file in master" do
+          actual = "[GitLab API doc](doc/api/README.md)\n"
+          expected = "<p><a href=\"/#{project.path_with_namespace}/blob/#{@ref}/doc/api/README.md\">GitLab API doc</a></p>\n"
+          expect(markdown(actual)).to match(expected)
+        end
 
-    it "should not handle relative urls for the current file with an anchor" do
-      actual = "[GitLab API doc](#section)\n"
-      expected = "<p><a href=\"#section\">GitLab API doc</a></p>\n"
-      expect(markdown(actual)).to match(expected)
-    end
+        it "should handle relative urls for a file in master with an anchor" do
+          actual = "[GitLab API doc](doc/api/README.md#section)\n"
+          expected = "<p><a href=\"/#{project.path_with_namespace}/blob/#{@ref}/doc/api/README.md#section\">GitLab API doc</a></p>\n"
+          expect(markdown(actual)).to match(expected)
+        end
 
-    it "should handle relative urls for a directory in master" do
-      actual = "[GitLab API doc](doc/api)\n"
-      expected = "<p><a href=\"/#{project.path_with_namespace}/tree/#{@ref}/doc/api\">GitLab API doc</a></p>\n"
-      expect(markdown(actual)).to match(expected)
-    end
+        it "should not handle relative urls for the current file with an anchor" do
+          actual = "[GitLab API doc](#section)\n"
+          expected = "<p><a href=\"#section\">GitLab API doc</a></p>\n"
+          expect(markdown(actual)).to match(expected)
+        end
 
-    it "should handle absolute urls" do
-      actual = "[GitLab](https://www.gitlab.com)\n"
-      expected = "<p><a href=\"https://www.gitlab.com\">GitLab</a></p>\n"
-      expect(markdown(actual)).to match(expected)
-    end
+        it "should handle relative urls for a directory in master" do
+          actual = "[GitLab API doc](doc/api)\n"
+          expected = "<p><a href=\"/#{project.path_with_namespace}/tree/#{@ref}/doc/api\">GitLab API doc</a></p>\n"
+          expect(markdown(actual)).to match(expected)
+        end
 
-    it "should handle relative urls in reference links for a file in master" do
-      actual = "[GitLab API doc][GitLab readme]\n [GitLab readme]: doc/api/README.md\n"
-      expected = "<p><a href=\"/#{project.path_with_namespace}/blob/#{@ref}/doc/api/README.md\">GitLab API doc</a></p>\n"
-      expect(markdown(actual)).to match(expected)
-    end
+        it "should handle absolute urls" do
+          actual = "[GitLab](https://www.gitlab.com)\n"
+          expected = "<p><a href=\"https://www.gitlab.com\">GitLab</a></p>\n"
+          expect(markdown(actual)).to match(expected)
+        end
 
-    it "should handle relative urls in reference links for a directory in master" do
-      actual = "[GitLab API doc directory][GitLab readmes]\n [GitLab readmes]: doc/api/\n"
-      expected = "<p><a href=\"/#{project.path_with_namespace}/tree/#{@ref}/doc/api\">GitLab API doc directory</a></p>\n"
-      expect(markdown(actual)).to match(expected)
-    end
+        it "should handle relative urls in reference links for a file in master" do
+          actual = "[GitLab API doc][GitLab readme]\n [GitLab readme]: doc/api/README.md\n"
+          expected = "<p><a href=\"/#{project.path_with_namespace}/blob/#{@ref}/doc/api/README.md\">GitLab API doc</a></p>\n"
+          expect(markdown(actual)).to match(expected)
+        end
 
-     it "should not handle malformed relative urls in reference links for a file in master" do
-      actual = "[GitLab readme]: doc/api/README.md\n"
-      expected = ""
-      expect(markdown(actual)).to match(expected)
-    end
+        it "should handle relative urls in reference links for a directory in master" do
+          actual = "[GitLab API doc directory][GitLab readmes]\n [GitLab readmes]: doc/api/\n"
+          expected = "<p><a href=\"/#{project.path_with_namespace}/tree/#{@ref}/doc/api\">GitLab API doc directory</a></p>\n"
+          expect(markdown(actual)).to match(expected)
+        end
 
-    it 'should allow whitelisted HTML tags from the user' do
-      actual = '<dl><dt>Term</dt><dd>Definition</dd></dl>'
-      expect(markdown(actual)).to match(actual)
+        it "should not handle malformed relative urls in reference links for a file in master" do
+          actual = "[GitLab readme]: doc/api/README.md\n"
+          expected = ""
+          expect(markdown(actual)).to match(expected)
+        end
+
+        it 'should allow whitelisted HTML tags from the user' do
+          actual = '<dl><dt>Term</dt><dd>Definition</dd></dl>'
+          expect(markdown(actual)).to match(actual)
+        end
+      end
+
+      context 'with an empty repository' do
+        before do
+          @project = create(:empty_project)
+          @repository = @project.repository
+        end
+
+        it "should not touch relative urls" do
+          actual = "[GitLab API doc][GitLab readme]\n [GitLab readme]: doc/api/README.md\n"
+          expected = "<p><a href=\"doc/api/README.md\">GitLab API doc</a></p>\n"
+          expect(markdown(actual)).to match(expected)
+        end
+      end
     end
 
     # SANITIZATION ------------------------------------------------------------
+    # TODO (rspeicher): These are testing SanitizationFilter, not `markdown`
 
     it 'should sanitize tags that are not whitelisted' do
       actual = '<textarea>no inputs allowed</textarea> <blink>no blinks</blink>'
@@ -375,20 +383,6 @@ describe GitlabMarkdownHelper do
     end
   end
 
-  # TODO (rspeicher): This should be a context of relative link specs, not its own thing
-  describe 'markdown for empty repository' do
-    before do
-      @project = create(:empty_project)
-      @repository = @project.repository
-    end
-
-    it "should not touch relative urls" do
-      actual = "[GitLab API doc][GitLab readme]\n [GitLab readme]: doc/api/README.md\n"
-      expected = "<p><a href=\"doc/api/README.md\">GitLab API doc</a></p>\n"
-      expect(markdown(actual)).to match(expected)
-    end
-  end
-
   describe '#render_wiki_content' do
     before do
       @wiki = double('WikiPage')

From 65c83f8a22ba9747ba6bf01f14d30cd096e3f343 Mon Sep 17 00:00:00 2001
From: Patricio Cano <patricio@gitlab.com>
Date: Tue, 21 Apr 2015 12:25:37 -0500
Subject: [PATCH 69/80] Updated the Slack documentation

---
 doc/integration/slack.md | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/doc/integration/slack.md b/doc/integration/slack.md
index 2fd22c513ad..84f1d74c058 100644
--- a/doc/integration/slack.md
+++ b/doc/integration/slack.md
@@ -16,7 +16,7 @@ To enable Slack integration you must create an Incoming WebHooks integration on
 
 1.  Choose the channel name you want to send notifications to
 
-1.  Click **Add Incoming WebHooks Integration**Add Integrations.
+1.  Click **Add Incoming WebHooks Integration**
     - Optional step; You can change bot's name and avatar by clicking modifying the bot name or avatar under **Integration Settings**.
 
 1. Copy the **Webhook URL**, we'll need this later for GitLab.
@@ -32,10 +32,15 @@ After Slack is ready we need to setup GitLab. Here are the steps to achieve this
 
 1.  Navigate to Settings -> Services -> Slack
 
-1.  Fill in your Slack details
+1. Pick the triggers you want to activate
 
+1.  Fill in your Slack details
+    - Webhook: Paste the Webhook URL from the step above
+    - Username: Fill this in if you want to change the username of the bot
+    - Channel: Fill this in if you want to change the channel where the messages will be posted
     - Mark it as active
-    - Paste in the webhook URL you got from Slack
+    
+1. Save your settings
 
 Have fun :)
 

From 3ceb888d79165da285799840e292b1e72f372ddd Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Tue, 21 Apr 2015 15:19:06 -0400
Subject: [PATCH 70/80] Fix tab behavior on MergeRequests#new

---
 app/views/projects/merge_requests/_new_submit.html.haml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/projects/merge_requests/_new_submit.html.haml b/app/views/projects/merge_requests/_new_submit.html.haml
index d986ce67c0c..4e72458932c 100644
--- a/app/views/projects/merge_requests/_new_submit.html.haml
+++ b/app/views/projects/merge_requests/_new_submit.html.haml
@@ -82,12 +82,12 @@
 
 .mr-compare.merge-request
   %ul.nav.nav-tabs.merge-request-tabs
-    %li.commits-tab{data: {action: 'commits'}}
+    %li.commits-tab{data: {action: 'commits', toggle: 'tab'}}
       = link_to url_for(params) do
         %i.fa.fa-history
         Commits
         %span.badge= @commits.size
-    %li.diffs-tab{data: {action: 'diffs'}}
+    %li.diffs-tab{data: {action: 'diffs', toggle: 'tab'}}
       = link_to url_for(params) do
         %i.fa.fa-list-alt
         Changes

From 34b976fd27b98e97990b68d06f6b5b776fe210b6 Mon Sep 17 00:00:00 2001
From: Dominik Sander <git@dsander.de>
Date: Tue, 21 Apr 2015 22:16:53 +0200
Subject: [PATCH 71/80] Make issue preview look like the result

---
 app/views/projects/_md_preview.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/projects/_md_preview.html.haml b/app/views/projects/_md_preview.html.haml
index f356a25dbfa..b869fd6e12a 100644
--- a/app/views/projects/_md_preview.html.haml
+++ b/app/views/projects/_md_preview.html.haml
@@ -9,5 +9,5 @@
 %div
   .md-write-holder
     = yield
-  .md-preview-holder.hide
+  .md.md-preview-holder.hide
     .js-md-preview{class: (preview_class if defined?(preview_class))}

From 681fb7def6cc53de1751dd4085177964d3d1f6a3 Mon Sep 17 00:00:00 2001
From: Chulki Lee <chulki.lee@gmail.com>
Date: Mon, 30 Mar 2015 15:54:30 -0700
Subject: [PATCH 72/80] do not send empty message to hipchat

---
 CHANGELOG                                      | 1 +
 app/models/project_services/hipchat_service.rb | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 55081988071..fa8ecbd8c74 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,7 @@ v 7.11.0 (unreleased)
   -
   -
   - Improve new project command options (Ben Bodenmiller)
+  - Prevent sending empty messages to HipChat (Chulki Lee)
 
 v 7.10.0 (unreleased)
   - Ignore submodules that are defined in .gitmodules but are checked in as directories.
diff --git a/app/models/project_services/hipchat_service.rb b/app/models/project_services/hipchat_service.rb
index d264a56ebdf..07520eab5d1 100644
--- a/app/models/project_services/hipchat_service.rb
+++ b/app/models/project_services/hipchat_service.rb
@@ -50,8 +50,9 @@ class HipchatService < Service
 
   def execute(data)
     return unless supported_events.include?(data[:object_kind])
-
-    gate[room].send('GitLab', create_message(data))
+    message = create_message(data)
+    return unless message.present?
+    gate[room].send('GitLab', message)
   end
 
   private

From c917b26f410fba6757ccf10f8b1c357ea3f2ab15 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Tue, 21 Apr 2015 14:36:06 -0400
Subject: [PATCH 73/80] Recover from all `URI::Error`s

Fixes #2257
Fixes #2260
---
 app/helpers/application_helper.rb       | 12 ++++++++----
 spec/helpers/application_helper_spec.rb | 10 ++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 20457572a08..2b41d421610 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -255,11 +255,15 @@ module ApplicationHelper
   #
   # Returns `html_options`, adding `rel: nofollow` for external links
   def add_nofollow(link, html_options = {})
-    uri = URI(link)
+    begin
+      uri = URI(link)
 
-    if uri && uri.absolute? && uri.host != Gitlab.config.gitlab.host
-      rel = html_options.fetch(:rel, '')
-      html_options[:rel] = (rel + ' nofollow').strip
+      if uri && uri.absolute? && uri.host != Gitlab.config.gitlab.host
+        rel = html_options.fetch(:rel, '')
+        html_options[:rel] = (rel + ' nofollow').strip
+      end
+    rescue URI::Error
+      # noop
     end
 
     html_options
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 015a66f7fa0..d4cf6540080 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -249,6 +249,16 @@ describe ApplicationHelper do
       expect(link_to('Example', 'http://example.foo/bar')).
         to eq '<a href="http://example.foo/bar">Example</a>'
     end
+
+    it 'should not raise an error when given a bad URI' do
+      expect { link_to('default', 'if real=1 RANDOM; if real>1 IDLHS; if real>500 LHS') }.
+        not_to raise_error
+    end
+
+    it 'should not raise an error when given a bad mailto URL' do
+      expect { link_to('email', 'mailto://foo.bar@example.es?subject=Subject%20Line') }.
+        not_to raise_error
+    end
   end
 
   describe 'markup_render' do

From e5b32f3c20834e593e853e285a71d0e1bbaff500 Mon Sep 17 00:00:00 2001
From: Boyan Tabakov <boyan.tabakov@futurice.com>
Date: Fri, 20 Feb 2015 14:50:44 +0200
Subject: [PATCH 74/80] Fix user API tests succeeding for the wrong reason

The requests were missing multiple required attributes, while testing for single attribute missing.
Added test for checking username as required attribute.
---
 spec/requests/api/users_spec.rb | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb
index 081400cdedd..a0acc4d9c11 100644
--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
@@ -110,17 +110,22 @@ describe API::API, api: true  do
     end
 
     it 'should return 400 error if name not given' do
-      post api('/users', admin), email: 'test@example.com', password: 'pass1234'
+      post api('/users', admin), attributes_for(:user).except(:name)
       expect(response.status).to eq(400)
     end
 
     it 'should return 400 error if password not given' do
-      post api('/users', admin), email: 'test@example.com', name: 'test'
+      post api('/users', admin), attributes_for(:user).except(:password)
       expect(response.status).to eq(400)
     end
 
-    it "should return 400 error if email not given" do
-      post api('/users', admin), password: 'pass1234', name: 'test'
+    it 'should return 400 error if email not given' do
+      post api('/users', admin), attributes_for(:user).except(:email)
+      expect(response.status).to eq(400)
+    end
+
+    it 'should return 400 error if username not given' do
+      post api('/users', admin), attributes_for(:user).except(:username)
       expect(response.status).to eq(400)
     end
 

From 9ba85ffe88ac16cb2e20160352cf1c3f769f94cc Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Wed, 22 Apr 2015 11:19:40 +0200
Subject: [PATCH 75/80] Update gitlab-grack to 2.0.2.

---
 Gemfile      | 4 ++--
 Gemfile.lock | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3c42885ef80..9662f15bf9e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -42,7 +42,7 @@ gem "browser"
 gem "gitlab_git", '~> 7.1.10'
 
 # Ruby/Rack Git Smart-HTTP Server Handler
-gem 'gitlab-grack', '~> 2.0.1', require: 'grack'
+gem 'gitlab-grack', '~> 2.0.2', require: 'grack'
 
 # LDAP Auth
 gem 'gitlab_omniauth-ldap', '1.2.1', require: "omniauth-ldap"
@@ -256,7 +256,7 @@ group :development, :test do
   gem "spring", '~> 1.3.1'
   gem "spring-commands-rspec", '1.0.4'
   gem "spring-commands-spinach", '1.0.0'
-  
+
   gem "byebug"
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 8f66476ad63..8679da009c2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -199,7 +199,7 @@ GEM
     gitlab-flowdock-git-hook (0.4.2.2)
       gitlab-grit (>= 2.4.1)
       multi_json
-    gitlab-grack (2.0.1)
+    gitlab-grack (2.0.2)
       rack (~> 1.5.1)
     gitlab-grit (2.7.2)
       charlock_holmes (~> 0.6)
@@ -696,7 +696,7 @@ DEPENDENCIES
   gemnasium-gitlab-service (~> 0.2)
   github-markup
   gitlab-flowdock-git-hook (~> 0.4.2)
-  gitlab-grack (~> 2.0.1)
+  gitlab-grack (~> 2.0.2)
   gitlab-linguist (~> 3.0.1)
   gitlab_emoji (~> 0.1)
   gitlab_git (~> 7.1.10)

From 6fee85900b4f53151562b7c3c7a448035f986744 Mon Sep 17 00:00:00 2001
From: Job van der Voort <job@gitlab.com>
Date: Wed, 22 Apr 2015 12:51:22 +0000
Subject: [PATCH 76/80] add 7.9-7.10 upgrade doc

---
 7.9-to-7.10 | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 118 insertions(+)
 create mode 100644 7.9-to-7.10

diff --git a/7.9-to-7.10 b/7.9-to-7.10
new file mode 100644
index 00000000000..0512e7cde7c
--- /dev/null
+++ b/7.9-to-7.10
@@ -0,0 +1,118 @@
+# From 7.9 to 7.10
+
+### 0. Stop server
+
+    sudo service gitlab stop
+
+### 1. Backup
+
+```bash
+cd /home/git/gitlab
+sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
+```
+
+### 2. Get latest code
+
+```bash
+sudo -u git -H git fetch --all
+sudo -u git -H git checkout -- db/schema.rb # local changes will be restored automatically
+```
+
+For GitLab Community Edition:
+
+```bash
+sudo -u git -H git checkout 7-10-stable
+```
+
+OR
+
+For GitLab Enterprise Edition:
+
+```bash
+sudo -u git -H git checkout 7-10-stable-ee
+```
+
+### 3. Update gitlab-shell
+
+```bash
+cd /home/git/gitlab-shell
+sudo -u git -H git fetch
+sudo -u git -H git checkout v2.6.2
+```
+
+### 4. Install libs, migrations, etc.
+
+```bash
+cd /home/git/gitlab
+
+# MySQL installations (note: the line below states '--without ... postgres')
+sudo -u git -H bundle install --without development test postgres --deployment
+
+# PostgreSQL installations (note: the line below states '--without ... mysql')
+sudo -u git -H bundle install --without development test mysql --deployment
+
+# Run database migrations
+sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
+
+# Clean up assets and cache
+sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS_ENV=production
+
+# Update init.d script
+sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
+```
+
+### 5. Update config files
+
+#### New configuration options for `gitlab.yml`
+
+There are new configuration options available for [`gitlab.yml`](config/gitlab.yml.example). View them with the command below and apply them to your current `gitlab.yml`.
+
+```
+git diff origin/7-9-stable:config/gitlab.yml.example origin/7-10-stable:config/gitlab.yml.example
+```
+
+#### Change Nginx settings
+
+* HTTP setups: Make `/etc/nginx/sites-available/gitlab` the same as [`lib/support/nginx/gitlab`](/lib/support/nginx/gitlab) but with your settings.
+* HTTPS setups: Make `/etc/nginx/sites-available/gitlab-ssl` the same as [`lib/support/nginx/gitlab-ssl`](/lib/support/nginx/gitlab-ssl) but with your settings.
+* A new `location /uploads/` section has been added that needs to have the same content as the existing `location @gitlab` section.
+
+#### Setup time zone (optional)
+
+Consider setting the time zone in `gitlab.yml` otherwise GitLab will default to UTC. If you set a time zone previously in [`application.rb`](config/application.rb) (unlikely), unset it.
+
+### 6. Start application
+
+    sudo service gitlab start
+    sudo service nginx restart
+
+### 7. Check application status
+
+Check if GitLab and its environment are configured correctly:
+
+    sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production
+
+To make sure you didn't miss anything run a more thorough check with:
+
+    sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production
+
+If all items are green, then congratulations upgrade is complete!
+
+### 8. GitHub settings (if applicable)
+
+If you are using GitHub as an OAuth provider for authentication, you should change the callback URL so that it
+only contains a root URL (ex. `https://gitlab.example.com/`)
+
+## Things went south? Revert to previous version (7.9)
+
+### 1. Revert the code to the previous version
+Follow the [upgrade guide from 7.8 to 7.8](7.8-to-7.9.md), except for the database migration
+(The backup is already migrated to the previous version)
+
+### 2. Restore from the backup:
+
+```bash
+cd /home/git/gitlab
+sudo -u git -H bundle exec rake gitlab:backup:restore RAILS_ENV=production
+```
+If you have more than one backup *.tar file(s) please add `BACKUP=timestamp_of_backup` to the command above.
\ No newline at end of file

From 3196c52969fded4bf1cb2e2977ef5284a43ec02d Mon Sep 17 00:00:00 2001
From: Ioannis Kappas <ikappas@devworks.gr>
Date: Thu, 2 Apr 2015 11:18:42 +0300
Subject: [PATCH 77/80] added fieldset support to project and admin services
 views. split field logic to separate template.

---
 app/views/admin/services/_form.html.haml    | 62 +++++++++------------
 app/views/projects/services/_form.html.haml | 62 +++++++++------------
 app/views/shared/_field.html.haml           | 24 ++++++++
 3 files changed, 74 insertions(+), 74 deletions(-)
 create mode 100644 app/views/shared/_field.html.haml

diff --git a/app/views/admin/services/_form.html.haml b/app/views/admin/services/_form.html.haml
index eb7a099bfe2..34ca7776c9e 100644
--- a/app/views/admin/services/_form.html.haml
+++ b/app/views/admin/services/_form.html.haml
@@ -3,7 +3,7 @@
 
 %p #{@service.description} template
 
-= form_for :service, url: admin_application_settings_service_path, method: :put, html: { class: 'form-horizontal fieldset-form' } do |f|
+= form_for :service, url: admin_application_settings_service_path, method: :put, html: { class: 'form-horizontal fieldset-form' } do |form|
   - if @service.errors.any?
     #error_explanation
       .alert.alert-danger
@@ -15,80 +15,68 @@
         = markdown @service.help
 
   .form-group
-    = f.label :active, "Active", class: "control-label"
+    = form.label :active, "Active", class: "control-label"
     .col-sm-10
-      = f.check_box :active
+      = form.check_box :active
 
   - if @service.supported_events.length > 1
     .form-group
-      = f.label :url, "Trigger", class: 'control-label'
+      = form.label :url, "Trigger", class: 'control-label'
       .col-sm-10
         - if @service.supported_events.include?("push")
           %div
-            = f.check_box :push_events, class: 'pull-left'
+            = form.check_box :push_events, class: 'pull-left'
             .prepend-left-20
-              = f.label :push_events, class: 'list-label' do
+              = form.label :push_events, class: 'list-label' do
                 %strong Push events
               %p.light
                 This url will be triggered by a push to the repository
         - if @service.supported_events.include?("tag_push")
           %div
-            = f.check_box :tag_push_events, class: 'pull-left'
+            = form.check_box :tag_push_events, class: 'pull-left'
             .prepend-left-20
-              = f.label :tag_push_events, class: 'list-label' do
+              = form.label :tag_push_events, class: 'list-label' do
                 %strong Tag push events
               %p.light
                 This url will be triggered when a new tag is pushed to the repository
         - if @service.supported_events.include?("note")
           %div
-            = f.check_box :note_events, class: 'pull-left'
+            = form.check_box :note_events, class: 'pull-left'
             .prepend-left-20
-              = f.label :note_events, class: 'list-label' do
+              = form.label :note_events, class: 'list-label' do
                 %strong Comments
               %p.light
                 This url will be triggered when someone adds a comment
         - if @service.supported_events.include?("issue")
           %div
-            = f.check_box :issues_events, class: 'pull-left'
+            = form.check_box :issues_events, class: 'pull-left'
             .prepend-left-20
-              = f.label :issues_events, class: 'list-label' do
+              = form.label :issues_events, class: 'list-label' do
                 %strong Issues events
               %p.light
                 This url will be triggered when an issue is created
         - if @service.supported_events.include?("merge_request")
           %div
-            = f.check_box :merge_requests_events, class: 'pull-left'
+            = form.check_box :merge_requests_events, class: 'pull-left'
             .prepend-left-20
-              = f.label :merge_requests_events, class: 'list-label' do
+              = form.label :merge_requests_events, class: 'list-label' do
                 %strong Merge Request events
               %p.light
                 This url will be triggered when a merge request is created
 
   - @service.fields.each do |field|
-    - name = field[:name]
-    - title = field[:title] || name.humanize
-    - value = @service.send(name) unless field[:type] == 'password'
     - type = field[:type]
-    - placeholder = field[:placeholder]
-    - choices = field[:choices]
-    - default_choice = field[:default_choice]
-    - help = field[:help]
 
-    .form-group
-      = f.label name, title, class: "control-label"
-      .col-sm-10
-        - if type == 'text'
-          = f.text_field name, class: "form-control", placeholder: placeholder
-        - elsif type == 'textarea'
-          = f.text_area name, rows: 5, class: "form-control", placeholder: placeholder
-        - elsif type == 'checkbox'
-          = f.check_box name
-        - elsif type == 'select'
-          = f.select name, options_for_select(choices, value ? value : default_choice), {}, { class: "form-control" }
-        - elsif type == 'password'
-          = f.password_field name, class: 'form-control'
-        - if help
-          %span.help-block= help
+    - if type == 'fieldset'
+      - fields = field[:fields]
+      - legend = field[:legend]
+
+      %fieldset
+        %legend= legend
+        - fields.each do |subfield|
+          = render 'shared/field', form: form, field: subfield
+    - else
+      = render 'shared/field', form: form, field: field
 
   .form-actions
-    = f.submit 'Save', class: 'btn btn-save'
+    = form.submit 'Save', class: 'btn btn-save'
diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml
index ce6b7a0737a..1b465e3addd 100644
--- a/app/views/projects/services/_form.html.haml
+++ b/app/views/projects/services/_form.html.haml
@@ -10,7 +10,7 @@
 
 %hr
 
-= form_for(@service, as: :service, url: namespace_project_service_path(@project.namespace, @project, @service.to_param), method: :put, html: { class: 'form-horizontal' }) do |f|
+= form_for(@service, as: :service, url: namespace_project_service_path(@project.namespace, @project, @service.to_param), method: :put, html: { class: 'form-horizontal' }) do |form|
   - if @service.errors.any?
     .alert.alert-danger
       %ul
@@ -23,83 +23,71 @@
         = markdown @service.help
 
   .form-group
-    = f.label :active, "Active", class: "control-label"
+    = form.label :active, "Active", class: "control-label"
     .col-sm-10
-      = f.check_box :active
+      = form.check_box :active
 
   - if @service.supported_events.length > 1
     .form-group
-      = f.label :url, "Trigger", class: 'control-label'
+      = form.label :url, "Trigger", class: 'control-label'
       .col-sm-10
         - if @service.supported_events.include?("push")
           %div
-            = f.check_box :push_events, class: 'pull-left'
+            = form.check_box :push_events, class: 'pull-left'
             .prepend-left-20
-              = f.label :push_events, class: 'list-label' do
+              = form.label :push_events, class: 'list-label' do
                 %strong Push events
               %p.light
                 This url will be triggered by a push to the repository
         - if @service.supported_events.include?("tag_push")
           %div
-            = f.check_box :tag_push_events, class: 'pull-left'
+            = form.check_box :tag_push_events, class: 'pull-left'
             .prepend-left-20
-              = f.label :tag_push_events, class: 'list-label' do
+              = form.label :tag_push_events, class: 'list-label' do
                 %strong Tag push events
               %p.light
                 This url will be triggered when a new tag is pushed to the repository
         - if @service.supported_events.include?("note")
           %div
-            = f.check_box :note_events, class: 'pull-left'
+            = form.check_box :note_events, class: 'pull-left'
             .prepend-left-20
-              = f.label :note_events, class: 'list-label' do
+              = form.label :note_events, class: 'list-label' do
                 %strong Comments
               %p.light
                 This url will be triggered when someone adds a comment
         - if @service.supported_events.include?("issue")
           %div
-            = f.check_box :issues_events, class: 'pull-left'
+            = form.check_box :issues_events, class: 'pull-left'
             .prepend-left-20
-              = f.label :issues_events, class: 'list-label' do
+              = form.label :issues_events, class: 'list-label' do
                 %strong Issues events
               %p.light
                 This url will be triggered when an issue is created
         - if @service.supported_events.include?("merge_request")
           %div
-            = f.check_box :merge_requests_events, class: 'pull-left'
+            = form.check_box :merge_requests_events, class: 'pull-left'
             .prepend-left-20
-              = f.label :merge_requests_events, class: 'list-label' do
+              = form.label :merge_requests_events, class: 'list-label' do
                 %strong Merge Request events
               %p.light
                 This url will be triggered when a merge request is created
 
   - @service.fields.each do |field|
-    - name = field[:name]
-    - title = field[:title] || name.humanize
-    - value = service_field_value(field[:type], @service.send(name))
     - type = field[:type]
-    - placeholder = field[:placeholder]
-    - choices = field[:choices]
-    - default_choice = field[:default_choice]
-    - help = field[:help]
 
-    .form-group
-      = f.label name, title, class: "control-label"
-      .col-sm-10
-        - if type == 'text'
-          = f.text_field name, class: "form-control", placeholder: placeholder
-        - elsif type == 'textarea'
-          = f.text_area name, rows: 5, class: "form-control", placeholder: placeholder
-        - elsif type == 'checkbox'
-          = f.check_box name
-        - elsif type == 'select'
-          = f.select name, options_for_select(choices, value ? value : default_choice), {}, { class: "form-control" }
-        - elsif type == 'password'
-          = f.password_field name, placeholder: value, class: 'form-control'
-        - if help
-          %span.help-block= help
+    - if type == 'fieldset'
+      - fields = field[:fields]
+      - legend = field[:legend]
+
+      %fieldset
+        %legend= legend
+        - fields.each do |subfield|
+          = render 'shared/field', form: form, field: subfield
+    - else
+      = render 'shared/field', form: form, field: field
 
   .form-actions
-    = f.submit 'Save', class: 'btn btn-save'
+    = form.submit 'Save', class: 'btn btn-save'
     &nbsp;
     - if @service.valid? && @service.activated?
       - disabled = @service.can_test? ? '':'disabled'
diff --git a/app/views/shared/_field.html.haml b/app/views/shared/_field.html.haml
new file mode 100644
index 00000000000..30d37dceb30
--- /dev/null
+++ b/app/views/shared/_field.html.haml
@@ -0,0 +1,24 @@
+- name = field[:name]
+- title = field[:title] || name.humanize
+- value = service_field_value(field[:type], @service.send(name))
+- type = field[:type]
+- placeholder = field[:placeholder]
+- choices = field[:choices]
+- default_choice = field[:default_choice]
+- help = field[:help]
+
+.form-group
+  = form.label name, title, class: "control-label"
+  .col-sm-10
+    - if type == 'text'
+      = form.text_field name, class: "form-control", placeholder: placeholder
+    - elsif type == 'textarea'
+      = form.text_area name, rows: 5, class: "form-control", placeholder: placeholder
+    - elsif type == 'checkbox'
+      = form.check_box name
+    - elsif type == 'select'
+      = form.select name, options_for_select(choices, value ? value : default_choice), {}, { class: "form-control" }
+    - elsif type == 'password'
+      = form.password_field name, placeholder: value, class: 'form-control'
+    - if help
+      %span.help-block= help

From 7d49b9656c3a6df77f6088ca580ca2d5fbba2719 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 22 Apr 2015 21:09:40 +0200
Subject: [PATCH 78/80] Update command in upgrader docs to work with 7.10.0.

---
 doc/update/upgrader.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/update/upgrader.md b/doc/update/upgrader.md
index f62a53d3340..e32984c4e68 100644
--- a/doc/update/upgrader.md
+++ b/doc/update/upgrader.md
@@ -26,12 +26,11 @@ If you have local changes to your GitLab repository the script will stash them a
 
 Note: GitLab 7.9 adds `nodejs` as a dependency. GitLab 7.6 adds `libkrb5-dev` as a dependency (installed by default on Ubuntu and OSX). GitLab 7.2 adds `pkg-config` and `cmake` as dependency. Please check the dependencies in the [installation guide.](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/installation.md#1-packages-dependencies)
 
-    # Starting with GitLab version 7.0 upgrader script has been moved to bin directory
     cd /home/git/gitlab
-    if [ -f bin/upgrade.rb ]; then sudo -u git -H ruby bin/upgrade.rb; else sudo -u git -H ruby script/upgrade.rb; fi
+    sudo -u git -H ruby -Ilib -e 'require "gitlab/upgrader"' -e 'class Gitlab::Upgrader' -e 'def latest_version_raw' -e '"v7.10.0"' -e 'end' -e 'end' -e 'Gitlab::Upgrader.new.execute'
 
     # to perform a non-interactive install (no user input required) you can add -y
-    # if [ -f bin/upgrade.rb ]; then sudo -u git -H ruby bin/upgrade.rb -y; else sudo -u git -H ruby script/upgrade.rb -y; fi
+    # sudo -u git -H ruby -Ilib -e 'require "gitlab/upgrader"' -e 'class Gitlab::Upgrader' -e 'def latest_version_raw' -e '"v7.10.0"' -e 'end' -e 'end' -e 'Gitlab::Upgrader.new.execute' -- -y
 
 ## 3. Start application
 
@@ -66,11 +65,12 @@ Here is a one line command with step 1 to 5 for the next time you upgrade:
 cd /home/git/gitlab; \
   sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production; \
   sudo service gitlab stop; \
-  if [ -f bin/upgrade.rb ]; then sudo -u git -H ruby bin/upgrade.rb -y; else sudo -u git -H ruby script/upgrade.rb -y; fi; \
+  sudo -u git -H ruby -Ilib -e 'require "gitlab/upgrader"' -e 'class Gitlab::Upgrader' -e 'def latest_version_raw' -e '"v7.10.0"' -e 'end' -e 'end' -e 'Gitlab::Upgrader.new.execute' -- -y; \
   cd /home/git/gitlab-shell; \
   sudo -u git -H git fetch; \
   sudo -u git -H git checkout v`cat /home/git/gitlab/GITLAB_SHELL_VERSION`; \
   cd /home/git/gitlab; \
   sudo service gitlab start; \
-  sudo service nginx restart; sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production
+  sudo service nginx restart; \
+  sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production
 ```

From 3a8bcea2e7e40bb607462ac62817ad3add91e5a9 Mon Sep 17 00:00:00 2001
From: Vincent Klaiber <vinkla@users.noreply.github.com>
Date: Sun, 22 Mar 2015 19:33:28 +0100
Subject: [PATCH 79/80] Fix nodejs installation guide in documentation.

---
 doc/update/7.8-to-7.9.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/update/7.8-to-7.9.md b/doc/update/7.8-to-7.9.md
index 28fd433e1c8..6ffa21c6141 100644
--- a/doc/update/7.8-to-7.9.md
+++ b/doc/update/7.8-to-7.9.md
@@ -42,6 +42,8 @@ sudo -u git -H git checkout v2.6.0
 
 ### 4. Install libs, migrations, etc.
 
+Please refer to the [Node.js setup documentation](https://github.com/joyent/node/wiki/installing-node.js-via-package-manager#debian-and-ubuntu-based-linux-distributions) if you aren't running default GitLab server setup.
+
 ```bash
 sudo apt-get install nodejs
 

From 8b4d1b78e965b7ad438f9a45e8511f4be5d3b733 Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Thu, 23 Apr 2015 09:05:30 +0200
Subject: [PATCH 80/80] Move the upgrade document to the correct location.

---
 7.9-to-7.10 => doc/update/7.9-to-7.10.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename 7.9-to-7.10 => doc/update/7.9-to-7.10.md (100%)

diff --git a/7.9-to-7.10 b/doc/update/7.9-to-7.10.md
similarity index 100%
rename from 7.9-to-7.10
rename to doc/update/7.9-to-7.10.md