Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-10-15 22:51:03 +0400
committerRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-10-16 01:40:02 +0400
commit1f4d8eac24a0feb18331fb18c67227d2175c8cd1 (patch)
tree5f076171f9f376d0c07d7a7710e7c7311f11a2fc /app
parent5cff72ad1e3287c6315619fe67fab15b934d1bc8 (diff)
Extract tree/readme partial
Diffstat (limited to 'app')
-rw-r--r--app/views/tree/_readme.html.haml10
-rw-r--r--app/views/tree/_tree.html.haml15
2 files changed, 13 insertions, 12 deletions
diff --git a/app/views/tree/_readme.html.haml b/app/views/tree/_readme.html.haml
new file mode 100644
index 00000000000..4e5f4b403c5
--- /dev/null
+++ b/app/views/tree/_readme.html.haml
@@ -0,0 +1,10 @@
+.file_holder#README
+ .file_title
+ %i.icon-file
+ = readme.name
+ .file_content.wiki
+ - if gitlab_markdown?(readme.name)
+ = preserve do
+ = markdown(readme.data)
+ - else
+ = raw GitHub::Markup.render(readme.name, readme.data) \ No newline at end of file
diff --git a/app/views/tree/_tree.html.haml b/app/views/tree/_tree.html.haml
index 57d04071205..08a83b9b272 100644
--- a/app/views/tree/_tree.html.haml
+++ b/app/views/tree/_tree.html.haml
@@ -12,7 +12,7 @@
%div#tree-content-holder.tree-content-holder
- if tree.is_blob?
- = render partial: "tree/blob", object: tree
+ = render "tree/blob", blob: tree
- else
%table#tree-slider{class: "table_#{@hex_path} tree-table" }
%thead
@@ -32,17 +32,8 @@
= render_tree(tree.contents)
- - if content = tree.contents.find { |c| c.is_a?(Grit::Blob) and c.name =~ /^readme/i }
- .file_holder#README
- .file_title
- %i.icon-file
- = content.name
- .file_content.wiki
- - if gitlab_markdown?(content.name)
- = preserve do
- = markdown(content.data)
- - else
- = raw GitHub::Markup.render(content.name, content.data)
+ - if readme = tree.contents.find { |c| c.is_a?(Grit::Blob) and c.name =~ /^readme/i }
+ = render "tree/readme", readme: readme
- unless tree.is_blob?
:javascript