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-16 01:38:35 +0400
committerRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-10-16 01:38:35 +0400
commit2f05ab149110705cf4947de3eff877391c94f9cb (patch)
treec4a1a63ed8d42b52e039db313bb5b91b920ec46a /app
parente84d90c1e75800bc4186c8360c5a0d331c124517 (diff)
Rename tree/tree_file partial to tree/blob
Diffstat (limited to 'app')
-rw-r--r--app/views/tree/_blob.html.haml (renamed from app/views/tree/_tree_file.html.haml)24
-rw-r--r--app/views/tree/_tree.html.haml2
2 files changed, 13 insertions, 13 deletions
diff --git a/app/views/tree/_tree_file.html.haml b/app/views/tree/_blob.html.haml
index 5202126792a..bae5b5388f7 100644
--- a/app/views/tree/_tree_file.html.haml
+++ b/app/views/tree/_blob.html.haml
@@ -2,34 +2,34 @@
.file_title
%i.icon-file
%span.file_name
- = tree_file.name.force_encoding('utf-8')
- %small #{tree_file.mode}
+ = blob.name.force_encoding('utf-8')
+ %small #{blob.mode}
%span.options
.btn-group.tree-btn-group
= 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"
= link_to "edit", edit_project_tree_path(@project, @id), class: "btn very_small"
- - if tree_file.text?
- - if gitlab_markdown?(tree_file.name)
+ - if blob.text?
+ - if gitlab_markdown?(blob.name)
.file_content.wiki
= preserve do
- = markdown(tree_file.data)
- - elsif markup?(tree_file.name)
+ = markdown(blob.data)
+ - elsif markup?(blob.name)
.file_content.wiki
- = raw GitHub::Markup.render(tree_file.name, tree_file.data)
+ = raw GitHub::Markup.render(blob.name, blob.data)
- else
.file_content.code
- - unless tree_file.empty?
+ - unless blob.empty?
%div{class: current_user.dark_scheme ? "black" : "white"}
= preserve do
- = raw tree_file.colorize(options: { linenos: 'True'})
+ = raw blob.colorize(options: { linenos: 'True'})
- else
%h4.nothing_here_message Empty file
- - elsif tree_file.image?
+ - elsif blob.image?
.file_content.image_file
- %img{ src: "data:#{tree_file.mime_type};base64,#{Base64.encode64(tree_file.data)}"}
+ %img{ src: "data:#{blob.mime_type};base64,#{Base64.encode64(blob.data)}"}
- else
.file_content.blob_file
@@ -39,4 +39,4 @@
%br
= image_tag "download.png", width: 64
%h3
- Download (#{tree_file.mb_size})
+ Download (#{blob.mb_size})
diff --git a/app/views/tree/_tree.html.haml b/app/views/tree/_tree.html.haml
index 2937a474bd9..57d04071205 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/tree_file", object: tree
+ = render partial: "tree/blob", object: tree
- else
%table#tree-slider{class: "table_#{@hex_path} tree-table" }
%thead