summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorAirat Shigapov <contact@airatshigapov.com>2016-09-15 18:45:22 +0300
committerblackst0ne <blackst0ne.ru@gmail.com>2016-10-21 08:43:35 +1100
commit3ab461dc64d8cadd61a67e632fde309fb887d1e8 (patch)
treef12155079c9ab5bd8898707735c0776f0ecf9206 /app
parent25447b46c6adf62a0aafc0da38d456ef80e489f3 (diff)
downloadgitlab-ce-3ab461dc64d8cadd61a67e632fde309fb887d1e8.tar.gz
Render hipchat notification descriptions as HTML instead of raw markdown
Diffstat (limited to 'app')
-rw-r--r--app/models/project_services/hipchat_service.rb9
1 files changed, 3 insertions, 6 deletions
diff --git a/app/models/project_services/hipchat_service.rb b/app/models/project_services/hipchat_service.rb
index afebd3b6a12..98f0312d84e 100644
--- a/app/models/project_services/hipchat_service.rb
+++ b/app/models/project_services/hipchat_service.rb
@@ -144,8 +144,7 @@ class HipchatService < Service
message = "#{user_name} #{state} #{issue_link} in #{project_link}: <b>#{title}</b>"
if description
- description = format_body(description)
- message << description
+ message << format_body(Banzai::Filter::MarkdownFilter.renderer.render(description))
end
message
@@ -167,8 +166,7 @@ class HipchatService < Service
"#{project_link}: <b>#{title}</b>"
if description
- description = format_body(description)
- message << description
+ message << format_body(Banzai::Filter::MarkdownFilter.renderer.render(description))
end
message
@@ -219,8 +217,7 @@ class HipchatService < Service
message << title
if note
- note = format_body(note)
- message << note
+ message << format_body(Banzai::Filter::MarkdownFilter.renderer.render(note))
end
message