From d6a5b45c8ea5ec7a68e213636fde405c52bb90e4 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Mon, 30 Nov 2015 21:14:46 +0100
Subject: Recognize issue/MR/snippet/commit links as references.

---
 app/models/snippet.rb | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'app/models/snippet.rb')

diff --git a/app/models/snippet.rb b/app/models/snippet.rb
index b0831982aa7..8ec12ddf6ef 100644
--- a/app/models/snippet.rb
+++ b/app/models/snippet.rb
@@ -60,11 +60,18 @@ class Snippet < ActiveRecord::Base
   # This pattern supports cross-project references.
   def self.reference_pattern
     %r{
-      (#{Project.reference_pattern})?
-      #{Regexp.escape(reference_prefix)}(?<snippet>\d+)
+      #{link_reference_pattern} |
+      (?:
+        (#{Project.reference_pattern})?
+        #{Regexp.escape(reference_prefix)}(?<snippet>\d+)
+      )
     }x
   end
 
+  def self.link_reference_pattern
+    super("snippets", /(?<snippet>\d+)/)
+  end
+
   def to_reference(from_project = nil)
     reference = "#{self.class.reference_prefix}#{id}"
 
-- 
cgit v1.2.1


From f3ea06eb7f8bef748be0882cb0b4fb58deed8eef Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Tue, 1 Dec 2015 15:51:27 +0100
Subject: Autolink first so we don't pick up numeric anchors as issue
 references.

---
 app/models/snippet.rb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'app/models/snippet.rb')

diff --git a/app/models/snippet.rb b/app/models/snippet.rb
index 8ec12ddf6ef..f876be7a4c8 100644
--- a/app/models/snippet.rb
+++ b/app/models/snippet.rb
@@ -60,11 +60,8 @@ class Snippet < ActiveRecord::Base
   # This pattern supports cross-project references.
   def self.reference_pattern
     %r{
-      #{link_reference_pattern} |
-      (?:
-        (#{Project.reference_pattern})?
-        #{Regexp.escape(reference_prefix)}(?<snippet>\d+)
-      )
+      (#{Project.reference_pattern})?
+      #{Regexp.escape(reference_prefix)}(?<snippet>\d+)
     }x
   end
 
-- 
cgit v1.2.1