Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorJacopo <beschi.jacopo@gmail.com>2018-01-21 14:06:48 +0300
committerJacopo <beschi.jacopo@gmail.com>2018-01-22 17:00:35 +0300
commit4f34206a5b9308efeb0970bfe62434e8fedf15c5 (patch)
tree03720dfd2d09a140e87d4db9807202241d7560d6 /app
parent269594bf2277e14d8cd189cdbbeeee7db8ed23d7 (diff)
Allows html in commits atom feed
Html code now works in commits atom feed `title` and `summary`.
Diffstat (limited to 'app')
-rw-r--r--app/views/projects/commits/_commit.atom.builder4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/commits/_commit.atom.builder b/app/views/projects/commits/_commit.atom.builder
index d806acdda13..04914888763 100644
--- a/app/views/projects/commits/_commit.atom.builder
+++ b/app/views/projects/commits/_commit.atom.builder
@@ -1,7 +1,7 @@
xml.entry do
xml.id project_commit_url(@project, id: commit.id)
xml.link href: project_commit_url(@project, id: commit.id)
- xml.title truncate(commit.title, length: 80)
+ xml.title truncate(commit.title, length: 80, escape: false)
xml.updated commit.committed_date.xmlschema
xml.media :thumbnail, width: "40", height: "40", url: image_url(avatar_icon(commit.author_email))
@@ -10,5 +10,5 @@ xml.entry do
xml.email commit.author_email
end
- xml.summary markdown(commit.description, pipeline: :single_line)
+ xml.summary markdown(commit.description, pipeline: :single_line), type: 'html'
end