Surround Project.reference_pattern in parenthesis inside other patterns
This commit is contained in:
parent
5cc9b17b8a
commit
1a9da9178c
4 changed files with 7 additions and 4 deletions
|
@ -72,7 +72,10 @@ class Commit
|
|||
#
|
||||
# This pattern supports cross-project references.
|
||||
def self.reference_pattern
|
||||
%r{(?:#{Project.reference_pattern}#{reference_prefix})?(?<commit>\h{6,40})}
|
||||
%r{
|
||||
(?:#{Project.reference_pattern}#{reference_prefix})?
|
||||
(?<commit>\h{6,40})
|
||||
}x
|
||||
end
|
||||
|
||||
def to_reference(from_project = nil)
|
||||
|
|
|
@ -63,7 +63,7 @@ class Issue < ActiveRecord::Base
|
|||
# This pattern supports cross-project references.
|
||||
def self.reference_pattern
|
||||
%r{
|
||||
#{Project.reference_pattern}?
|
||||
(#{Project.reference_pattern})?
|
||||
#{Regexp.escape(reference_prefix)}(?<issue>\d+)
|
||||
}x
|
||||
end
|
||||
|
|
|
@ -145,7 +145,7 @@ class MergeRequest < ActiveRecord::Base
|
|||
# This pattern supports cross-project references.
|
||||
def self.reference_pattern
|
||||
%r{
|
||||
#{Project.reference_pattern}?
|
||||
(#{Project.reference_pattern})?
|
||||
#{Regexp.escape(reference_prefix)}(?<merge_request>\d+)
|
||||
}x
|
||||
end
|
||||
|
|
|
@ -61,7 +61,7 @@ class Snippet < ActiveRecord::Base
|
|||
# This pattern supports cross-project references.
|
||||
def self.reference_pattern
|
||||
%r{
|
||||
#{Project.reference_pattern}?
|
||||
(#{Project.reference_pattern})?
|
||||
#{Regexp.escape(reference_prefix)}(?<snippet>\d+)
|
||||
}x
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue