deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

GFM refactor: Update pattern to avoid an extra HTML entities check

Browse source
This commit is contained in:
Robert Speicher 2012-08-14 03:49:55 -04:00
parent d1d19aecde
commit e31a9dd253
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/helpers/gitlab_markdown_helper.rb
View file

@ -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
unless vals[:prefix].try(:end_with?, "&") && vals[:suffix].try(:start_with?, ";")
issue = @project.issues.where(id: vals[:reference_id]).first 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 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 /^!/