summaryrefslogtreecommitdiff
path: root/app/models/snippet.rb
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2015-12-04 20:58:45 +0000
committerRobert Speicher <robert@gitlab.com>2015-12-04 20:58:45 +0000
commitd2f9a9012d55a7dc9c8e9e61b946c52836a1d8f1 (patch)
tree2d9a005407b7556a8383b08d841feef49653d63b /app/models/snippet.rb
parent3c8051776b25add2e2845344a328328db33d1671 (diff)
parentf9d954fae71d40a314a5812c1a7eec5a601d1575 (diff)
downloadgitlab-ce-d2f9a9012d55a7dc9c8e9e61b946c52836a1d8f1.tar.gz
Merge branch 'link-refs' into 'master'
Recognize issue/MR/snippet/commit links as references. Fixes #3744 and #3745 See merge request !1933
Diffstat (limited to 'app/models/snippet.rb')
-rw-r--r--app/models/snippet.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/snippet.rb b/app/models/snippet.rb
index b0831982aa7..f876be7a4c8 100644
--- a/app/models/snippet.rb
+++ b/app/models/snippet.rb
@@ -65,6 +65,10 @@ class Snippet < ActiveRecord::Base
}x
end
+ def self.link_reference_pattern
+ super("snippets", /(?<snippet>\d+)/)
+ end
+
def to_reference(from_project = nil)
reference = "#{self.class.reference_prefix}#{id}"