Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
2f05ab14
Commit
2f05ab14
authored
Oct 15, 2012
by
Riyad Preukschas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename tree/tree_file partial to tree/blob
parent
e84d90c1
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
13 deletions
+13
-13
app/views/tree/_blob.html.haml
app/views/tree/_blob.html.haml
+12
-12
app/views/tree/_tree.html.haml
app/views/tree/_tree.html.haml
+1
-1
No files found.
app/views/tree/_
tree_file
.html.haml
→
app/views/tree/_
blob
.html.haml
View file @
2f05ab14
...
@@ -2,34 +2,34 @@
...
@@ -2,34 +2,34 @@
.file_title
.file_title
%i
.icon-file
%i
.icon-file
%span
.file_name
%span
.file_name
=
tree_file
.
name
.
force_encoding
(
'utf-8'
)
=
blob
.
name
.
force_encoding
(
'utf-8'
)
%small
#{
tree_file
.
mode
}
%small
#{
blob
.
mode
}
%span
.options
%span
.options
.btn-group.tree-btn-group
.btn-group.tree-btn-group
=
link_to
"raw"
,
project_blob_path
(
@project
,
@id
),
class:
"btn very_small"
,
target:
"_blank"
=
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
"history"
,
project_commits_path
(
@project
,
@id
),
class:
"btn very_small"
=
link_to
"blame"
,
project_blame_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"
=
link_to
"edit"
,
edit_project_tree_path
(
@project
,
@id
),
class:
"btn very_small"
-
if
tree_file
.
text?
-
if
blob
.
text?
-
if
gitlab_markdown?
(
tree_file
.
name
)
-
if
gitlab_markdown?
(
blob
.
name
)
.file_content.wiki
.file_content.wiki
=
preserve
do
=
preserve
do
=
markdown
(
tree_file
.
data
)
=
markdown
(
blob
.
data
)
-
elsif
markup?
(
tree_file
.
name
)
-
elsif
markup?
(
blob
.
name
)
.file_content.wiki
.file_content.wiki
=
raw
GitHub
::
Markup
.
render
(
tree_file
.
name
,
tree_file
.
data
)
=
raw
GitHub
::
Markup
.
render
(
blob
.
name
,
blob
.
data
)
-
else
-
else
.file_content.code
.file_content.code
-
unless
tree_file
.
empty?
-
unless
blob
.
empty?
%div
{
class:
current_user
.
dark_scheme
?
"black"
:
"white"
}
%div
{
class:
current_user
.
dark_scheme
?
"black"
:
"white"
}
=
preserve
do
=
preserve
do
=
raw
tree_file
.
colorize
(
options:
{
linenos:
'True'
})
=
raw
blob
.
colorize
(
options:
{
linenos:
'True'
})
-
else
-
else
%h4
.nothing_here_message
Empty file
%h4
.nothing_here_message
Empty file
-
elsif
tree_file
.
image?
-
elsif
blob
.
image?
.file_content.image_file
.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
-
else
.file_content.blob_file
.file_content.blob_file
...
@@ -39,4 +39,4 @@
...
@@ -39,4 +39,4 @@
%br
%br
=
image_tag
"download.png"
,
width:
64
=
image_tag
"download.png"
,
width:
64
%h3
%h3
Download (
#{
tree_file
.
mb_size
}
)
Download (
#{
blob
.
mb_size
}
)
app/views/tree/_tree.html.haml
View file @
2f05ab14
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
%div
#tree-content-holder
.tree-content-holder
%div
#tree-content-holder
.tree-content-holder
-
if
tree
.
is_blob?
-
if
tree
.
is_blob?
=
render
partial:
"tree/
tree_file
"
,
object:
tree
=
render
partial:
"tree/
blob
"
,
object:
tree
-
else
-
else
%table
#tree-slider
{
class:
"table_#{@hex_path} tree-table"
}
%table
#tree-slider
{
class:
"table_#{@hex_path} tree-table"
}
%thead
%thead
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment