diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2014-08-10 13:25:35 +0200 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2014-08-10 13:25:35 +0200 |
| commit | 2fd30cc57f1d848c1f8e356aacfa76806549fb82 (patch) | |
| tree | 3551867e09d1f1315077c70fe16b1c0c32d753d2 /app | |
| parent | 9d3e384ae6553fee85b7a1ed2b99a18a9884606e (diff) | |
| download | gitlab-ce-2fd30cc57f1d848c1f8e356aacfa76806549fb82.tar.gz | |
Rescue if markup fails, fixes #7455
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/application_helper.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index c3d89eb1b82..ce1d0538b83 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -222,6 +222,8 @@ module ApplicationHelper 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) |