Download as
Browse Code »

Commit 453b2ae68b1f127de1deeb745950132542eac667

Authored by randx
1 parent e8d6c3c1
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix plain text readme

Showing 3 changed files with 16 additions and 1 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @453b2ae
... ... @@ -662,3 +662,11 @@ li.note {
662 662 }
663 663 }
664 664  
  665 +pre {
  666 + &.clean {
  667 + background:none;
  668 + border:none;
  669 + margin:0;
  670 + padding:0;
  671 + }
  672 +}
... ...
app/helpers/tree_helper.rb
  Diff comments   View file @453b2ae
... ... @@ -51,6 +51,10 @@ module TreeHelper
51 51 filename.end_with?(*%w(.mdown .md .markdown))
52 52 end
53 53  
  54 + def plain_text_readme? filename
  55 + filename == 'README'
  56 + end
  57 +
54 58 # Simple shortcut to File.join
55 59 def tree_join(*args)
56 60 File.join(*args)
... ...
app/views/tree/_readme.html.haml
  Diff comments   View file @453b2ae
... ... @@ -6,5 +6,8 @@
6 6 - if gitlab_markdown?(readme.name)
7 7 = preserve do
8 8 = markdown(readme.data)
  9 + - elsif plain_text_readme?(readme.name)
  10 + %pre.clean
  11 + = readme.data
9 12 - else
10   - = raw GitHub::Markup.render(readme.name, readme.data)
11 13 \ No newline at end of file
  14 + = raw GitHub::Markup.render(readme.name, readme.data)
... ...