diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2014-08-10 14:33:22 +0200 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2014-08-10 14:33:22 +0200 |
| commit | 0e3f8ea2ef2a7d6cc51ccb5d7ae854c6244b40eb (patch) | |
| tree | f761ca392fa152636b999d1b137b1ce418ca3a15 | |
| parent | 2fd30cc57f1d848c1f8e356aacfa76806549fb82 (diff) | |
| download | gitlab-ce-0e3f8ea2ef2a7d6cc51ccb5d7ae854c6244b40eb.tar.gz | |
Use simple_format if we don't have a proper renderer
| -rw-r--r-- | app/helpers/tree_helper.rb | 4 | ||||
| -rw-r--r-- | app/views/projects/tree/_readme.html.haml | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/app/helpers/tree_helper.rb b/app/helpers/tree_helper.rb index bde2a60faa9..29eb28af879 100644 --- a/app/helpers/tree_helper.rb +++ b/app/helpers/tree_helper.rb @@ -52,10 +52,6 @@ module TreeHelper filename.downcase.end_with?(*%w(.mdown .md .markdown)) end - def plain_text_readme? filename - filename =~ /^README(.txt)?$/i - end - # Simple shortcut to File.join def tree_join(*args) File.join(*args) diff --git a/app/views/projects/tree/_readme.html.haml b/app/views/projects/tree/_readme.html.haml index c066b7102fd..6257ba8c09a 100644 --- a/app/views/projects/tree/_readme.html.haml +++ b/app/views/projects/tree/_readme.html.haml @@ -6,8 +6,7 @@ - if gitlab_markdown?(readme.name) = preserve do = markdown(readme.data) - - elsif plain_text_readme?(readme.name) - %pre.clean - = readme.data - elsif markup?(readme.name) = render_markup(readme.name, readme.data) + - else + = simple_format(readme.data) |