Commit 1f4d8eac24a0feb18331fb18c67227d2175c8cd1
1 parent
5cff72ad
Exists in
master
and in
4 other branches
Extract tree/readme partial
Showing
2 changed files
with
13 additions
and
12 deletions
Show diff stats
... | ... | @@ -0,0 +1,10 @@ |
1 | +.file_holder#README | |
2 | + .file_title | |
3 | + %i.icon-file | |
4 | + = readme.name | |
5 | + .file_content.wiki | |
6 | + - if gitlab_markdown?(readme.name) | |
7 | + = preserve do | |
8 | + = markdown(readme.data) | |
9 | + - else | |
10 | + = raw GitHub::Markup.render(readme.name, readme.data) | |
0 | 11 | \ No newline at end of file | ... | ... |
app/views/tree/_tree.html.haml
... | ... | @@ -12,7 +12,7 @@ |
12 | 12 | |
13 | 13 | %div#tree-content-holder.tree-content-holder |
14 | 14 | - if tree.is_blob? |
15 | - = render partial: "tree/blob", object: tree | |
15 | + = render "tree/blob", blob: tree | |
16 | 16 | - else |
17 | 17 | %table#tree-slider{class: "table_#{@hex_path} tree-table" } |
18 | 18 | %thead |
... | ... | @@ -32,17 +32,8 @@ |
32 | 32 | |
33 | 33 | = render_tree(tree.contents) |
34 | 34 | |
35 | - - if content = tree.contents.find { |c| c.is_a?(Grit::Blob) and c.name =~ /^readme/i } | |
36 | - .file_holder#README | |
37 | - .file_title | |
38 | - %i.icon-file | |
39 | - = content.name | |
40 | - .file_content.wiki | |
41 | - - if gitlab_markdown?(content.name) | |
42 | - = preserve do | |
43 | - = markdown(content.data) | |
44 | - - else | |
45 | - = raw GitHub::Markup.render(content.name, content.data) | |
35 | + - if readme = tree.contents.find { |c| c.is_a?(Grit::Blob) and c.name =~ /^readme/i } | |
36 | + = render "tree/readme", readme: readme | |
46 | 37 | |
47 | 38 | - unless tree.is_blob? |
48 | 39 | :javascript | ... | ... |