Commit 96b4acf5 authored by Robert Speicher's avatar Robert Speicher

Remove locals from tree/tree_file and just use "object" instead

parent b5328879
No related merge requests found
......@@ -6,11 +6,13 @@
- tree.breadcrumbs(6) do |link|
\/
%li= link
.clear
%div.tree_progress
%div#tree-content-holder.tree-content-holder
- if tree.is_blob?
= render partial: "tree/tree_file", locals: { name: tree.name, content: tree.data, file: tree }
= render partial: "tree/tree_file", object: tree
- else
- contents = tree.contents
%table#tree-slider{class: "table_#{@hex_path} tree-table" }
......
......@@ -2,32 +2,32 @@
.file_title
%i.icon-file
%span.file_name
= name.force_encoding('utf-8')
%small #{file.mode}
= tree_file.name.force_encoding('utf-8')
%small #{tree_file.mode}
%span.options
= link_to "raw", project_blob_path(@project, @id), class: "btn very_small", target: "_blank"
= link_to "history", project_commits_path(@project, @id), class: "btn very_small"
= link_to "blame", project_blame_path(@project, @id), class: "btn very_small"
- if file.text?
- if gitlab_markdown?(name)
- if tree_file.text?
- if gitlab_markdown?(tree_file.name)
.file_content.wiki
= preserve do
= markdown(file.data)
- elsif markup?(name)
= markdown(tree_file.data)
- elsif markup?(tree_file.name)
.file_content.wiki
= raw GitHub::Markup.render(name, file.data)
= raw GitHub::Markup.render(tree_file.name, tree_file.data)
- else
.file_content.code
- unless file.empty?
- unless tree_file.empty?
%div{class: current_user.dark_scheme ? "black" : "white"}
= preserve do
= raw file.colorize(options: { linenos: 'True'})
= raw tree_file.colorize(options: { linenos: 'True'})
- else
%h4.nothing_here_message Empty file
- elsif file.image?
- elsif tree_file.image?
.file_content.image_file
%img{ src: "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"}
%img{ src: "data:#{tree_file.mime_type};base64,#{Base64.encode64(tree_file.data)}"}
- else
.file_content.blob_file
......@@ -37,4 +37,4 @@
%br
= image_tag "download.png", width: 64
%h3
Download (#{file.mb_size})
Download (#{tree_file.mb_size})
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment