Download as
Browse Code »

Commit ba72c6f683fc52a3223c45c5044abf1361e059fd

Authored by Robert Speicher
1 parent 496f88af
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Escape text passed directly to gfm

Showing 7 changed files with 7 additions and 7 deletions   Show diff stats
app/views/events/_commit.html.haml
  Diff comments   View file @ba72c6f
@@ -5,4 +5,4 @@ @@ -5,4 +5,4 @@
5 %strong.cdark= commit.author_name 5 %strong.cdark= commit.author_name
6 – 6 –
7 = image_tag gravatar_icon(commit.author_email), class: "avatar", width: 16 7 = image_tag gravatar_icon(commit.author_email), class: "avatar", width: 16
8 - = gfm truncate(commit.title, length: 50) rescue "--broken encoding" 8 + = gfm escape_once(truncate(commit.title, length: 50)) rescue "--broken encoding"
app/views/issues/show.html.haml
  Diff comments   View file @ba72c6f
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 .alert-message.error.status_info Closed 31 .alert-message.error.status_info Closed
32 - else 32 - else
33 .alert-message.success.status_info Open 33 .alert-message.success.status_info Open
34 - = gfm @issue.title 34 + = gfm escape_once(@issue.title)
35 35
36 .middle_box_content 36 .middle_box_content
37 %cite.cgray Created by 37 %cite.cgray Created by
app/views/merge_requests/show/_mr_box.html.haml
  Diff comments   View file @ba72c6f
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 .alert-message.error.status_info Closed 5 .alert-message.error.status_info Closed
6 - else 6 - else
7 .alert-message.success.status_info Open 7 .alert-message.success.status_info Open
8 - = gfm @merge_request.title 8 + = gfm escape_once(@merge_request.title)
9 9
10 .middle_box_content 10 .middle_box_content
11 %div 11 %div
app/views/milestones/show.html.haml
  Diff comments   View file @ba72c6f
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 .alert-message.error.status_info Closed 21 .alert-message.error.status_info Closed
22 - else 22 - else
23 .alert-message.success.status_info Open 23 .alert-message.success.status_info Open
24 - = gfm @milestone.title 24 + = gfm escape_once(@milestone.title)
25 %small.right= @milestone.expires_at 25 %small.right= @milestone.expires_at
26 26
27 .middle_box_content 27 .middle_box_content
app/views/repositories/_branch.html.haml
  Diff comments   View file @ba72c6f
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 %code= commit.short_id 11 %code= commit.short_id
12 12
13 = image_tag gravatar_icon(commit.author_email), class: "", width: 16 13 = image_tag gravatar_icon(commit.author_email), class: "", width: 16
14 - = gfm truncate(commit.title, length: 40) 14 + = gfm escape_once(truncate(commit.title, length: 40))
15 %span.update-author.right 15 %span.update-author.right
16 = time_ago_in_words(commit.committed_date) 16 = time_ago_in_words(commit.committed_date)
17 ago 17 ago
app/views/repositories/_feed.html.haml
  Diff comments   View file @ba72c6f
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 = link_to project_commits_path(@project, commit.id) do 13 = link_to project_commits_path(@project, commit.id) do
14 %code= commit.short_id 14 %code= commit.short_id
15 = image_tag gravatar_icon(commit.author_email), class: "", width: 16 15 = image_tag gravatar_icon(commit.author_email), class: "", width: 16
16 - = gfm truncate(commit.title, length: 40) 16 + = gfm escape_once(truncate(commit.title, length: 40))
17 %td 17 %td
18 %span.right.cgray 18 %span.right.cgray
19 = time_ago_in_words(commit.committed_date) 19 = time_ago_in_words(commit.committed_date)
app/views/repositories/tags.html.haml
  Diff comments   View file @ba72c6f
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 = link_to project_commit_path(@project, commit.id) do 17 = link_to project_commit_path(@project, commit.id) do
18 %code= commit.short_id 18 %code= commit.short_id
19 = image_tag gravatar_icon(commit.author_email), class: "", width: 16 19 = image_tag gravatar_icon(commit.author_email), class: "", width: 16
20 - = gfm truncate(commit.title, length: 40) 20 + = gfm escape_once(truncate(commit.title, length: 40))
21 %td 21 %td
22 %span.update-author.right 22 %span.update-author.right
23 = time_ago_in_words(commit.committed_date) 23 = time_ago_in_words(commit.committed_date)