diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-04-03 15:55:08 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-04-03 15:55:08 +0300 |
| commit | dfeef6c22849c04ffd225a0356fd11fb8e4907f6 (patch) | |
| tree | 02eafb752d203a1ca93ee8442299771b3610d737 /app | |
| parent | 413a310faa17f626f351fa3afd6423e8782935a9 (diff) | |
| download | gitlab-ce-dfeef6c22849c04ffd225a0356fd11fb8e4907f6.tar.gz | |
Fixed API file raw functionality, Fixed tree controller tests. Added BlobController specs
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/tree/_tree.html.haml | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/app/views/tree/_tree.html.haml b/app/views/tree/_tree.html.haml index 24c005fc7fe..f77b8983726 100644 --- a/app/views/tree/_tree.html.haml +++ b/app/views/tree/_tree.html.haml @@ -12,30 +12,27 @@ = link_to title, '#' %div#tree-content-holder.tree-content-holder - - if tree.is_blob? - = render "tree/blob", blob: tree - - else - %table#tree-slider{class: "table_#{@hex_path} tree-table" } - %thead - %tr - %th Name - %th Last Update - %th Last Commit - %th= link_to "history", project_commits_path(@project, @id), class: "btn btn-tiny pull-right" + %table#tree-slider{class: "table_#{@hex_path} tree-table" } + %thead + %tr + %th Name + %th Last Update + %th Last Commit + %th= link_to "history", project_commits_path(@project, @id), class: "btn btn-tiny pull-right" - - if tree.up_dir? - %tr.tree-item - %td.tree-item-file-name - = image_tag "file_empty.png", size: '16x16' - = link_to "..", project_tree_path(@project, up_dir_path(tree)) - %td - %td - %td + - if tree.up_dir? + %tr.tree-item + %td.tree-item-file-name + = image_tag "file_empty.png", size: '16x16' + = link_to "..", project_tree_path(@project, up_dir_path(tree)) + %td + %td + %td - = render_tree(tree) + = render_tree(tree) - - if tree.readme - = render "tree/readme", readme: tree.readme + - if tree.readme + = render "tree/readme", readme: tree.readme %div.tree_progress |