From 4dd1f906fd60bebd433dc9c4b5879c1e575fb735 Mon Sep 17 00:00:00 2001 From: Oswaldo Ferreira Date: Fri, 6 Apr 2018 12:13:18 -0300 Subject: Add support for patch link extension for commit links on GFM --- app/models/commit.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'app/models/commit.rb') diff --git a/app/models/commit.rb b/app/models/commit.rb index 3f7f36e83c0..de860df4b9c 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -30,6 +30,8 @@ class Commit MIN_SHA_LENGTH = Gitlab::Git::Commit::MIN_SHA_LENGTH COMMIT_SHA_PATTERN = /\h{#{MIN_SHA_LENGTH},40}/.freeze + # Used by GFM to match and present link extensions on node texts and hrefs. + LINK_EXTENSION_PATTERN = /(patch)/.freeze def banzai_render_context(field) pipeline = field == :description ? :commit_description : :single_line @@ -143,7 +145,8 @@ class Commit end def self.link_reference_pattern - @link_reference_pattern ||= super("commit", /(?#{COMMIT_SHA_PATTERN})/) + @link_reference_pattern ||= + super("commit", /(?#{COMMIT_SHA_PATTERN})?(\.(?#{LINK_EXTENSION_PATTERN}))?/) end def to_reference(from = nil, full: false) -- cgit v1.2.1