GFM refactor: Update pattern to avoid an extra HTML entities check
This commit is contained in:
parent
d1d19aecde
commit
e31a9dd253
|
@ -1,12 +1,12 @@
|
||||||
module GitlabMarkdownHelper
|
module GitlabMarkdownHelper
|
||||||
REFERENCE_PATTERN = %r{
|
REFERENCE_PATTERN = %r{
|
||||||
(\W)? # Prefix (1)
|
([^\w&;])? # Prefix (1)
|
||||||
( # Reference (2)
|
( # Reference (2)
|
||||||
@([\w\._]+) | # User name (3)
|
@([\w\._]+) | # User name (3)
|
||||||
[#!$](\d+) | # Issue/MR/Snippet ID (4)
|
[#!$](\d+) | # Issue/MR/Snippet ID (4)
|
||||||
[\h]{6,40} # Commit ID (2)
|
[\h]{6,40} # Commit ID (2)
|
||||||
)
|
)
|
||||||
(\W)? # Suffix (5)
|
([^\w&;])? # Suffix (5)
|
||||||
}x.freeze
|
}x.freeze
|
||||||
|
|
||||||
def gfm(text, html_options = {})
|
def gfm(text, html_options = {})
|
||||||
|
@ -86,11 +86,8 @@ module GitlabMarkdownHelper
|
||||||
|
|
||||||
# issue: #123
|
# issue: #123
|
||||||
when /^#/
|
when /^#/
|
||||||
# avoid HTML entities
|
issue = @project.issues.where(id: vals[:reference_id]).first
|
||||||
unless vals[:prefix].try(:end_with?, "&") && vals[:suffix].try(:start_with?, ";")
|
link_to("##{issue.id}", project_issue_path(@project, issue), html_options.merge(title: "Issue: #{issue.title}", class: "gfm gfm-issue #{html_options[:class]}")) if issue
|
||||||
issue = @project.issues.where(id: vals[:reference_id]).first
|
|
||||||
link_to("##{issue.id}", project_issue_path(@project, issue), html_options.merge(title: "Issue: #{issue.title}", class: "gfm gfm-issue #{html_options[:class]}")) if issue
|
|
||||||
end
|
|
||||||
|
|
||||||
# merge request: !123
|
# merge request: !123
|
||||||
when /^!/
|
when /^!/
|
||||||
|
|
Loading…
Reference in New Issue