From 2fd30cc57f1d848c1f8e356aacfa76806549fb82 Mon Sep 17 00:00:00 2001
From: Robert Schilling <rschilling@student.tugraz.at>
Date: Sun, 10 Aug 2014 13:25:35 +0200
Subject: [PATCH] Rescue if markup fails, fixes #7455
---
app/helpers/application_helper.rb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index c3d89eb1b82d..ce1d0538b835 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -222,6 +222,8 @@ def time_ago_with_tooltip(date, placement = 'top', html_class = 'time_ago')
def render_markup(file_name, file_content)
GitHub::Markup.render(file_name, file_content).html_safe
+ rescue RuntimeError
+ simple_format(file_content)
end
def spinner(text = nil, visible = false)
--
GitLab