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
Jérome Perrin
gitlab-ce
Commits
96b4acf5
Commit
96b4acf5
authored
Oct 03, 2012
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove locals from tree/tree_file and just use "object" instead
parent
b5328879
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
13 deletions
+15
-13
app/views/tree/_tree.html.haml
app/views/tree/_tree.html.haml
+3
-1
app/views/tree/_tree_file.html.haml
app/views/tree/_tree_file.html.haml
+12
-12
No files found.
app/views/tree/_tree.html.haml
View file @
96b4acf5
...
@@ -6,11 +6,13 @@
...
@@ -6,11 +6,13 @@
-
tree
.
breadcrumbs
(
6
)
do
|
link
|
-
tree
.
breadcrumbs
(
6
)
do
|
link
|
\/
\/
%li
=
link
%li
=
link
.clear
.clear
%div
.tree_progress
%div
.tree_progress
%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"
,
locals:
{
name:
tree
.
name
,
content:
tree
.
data
,
file:
tree
}
=
render
partial:
"tree/tree_file"
,
object:
tree
-
else
-
else
-
contents
=
tree
.
contents
-
contents
=
tree
.
contents
%table
#tree-slider
{
class:
"table_#{@hex_path} tree-table"
}
%table
#tree-slider
{
class:
"table_#{@hex_path} tree-table"
}
...
...
app/views/tree/_tree_file.html.haml
View file @
96b4acf5
...
@@ -2,32 +2,32 @@
...
@@ -2,32 +2,32 @@
.file_title
.file_title
%i
.icon-file
%i
.icon-file
%span
.file_name
%span
.file_name
=
name
.
force_encoding
(
'utf-8'
)
=
tree_file
.
name
.
force_encoding
(
'utf-8'
)
%small
#{
file
.
mode
}
%small
#{
tree_
file
.
mode
}
%span
.options
%span
.options
=
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"
-
if
file
.
text?
-
if
tree_
file
.
text?
-
if
gitlab_markdown?
(
name
)
-
if
gitlab_markdown?
(
tree_file
.
name
)
.file_content.wiki
.file_content.wiki
=
preserve
do
=
preserve
do
=
markdown
(
file
.
data
)
=
markdown
(
tree_
file
.
data
)
-
elsif
markup?
(
name
)
-
elsif
markup?
(
tree_file
.
name
)
.file_content.wiki
.file_content.wiki
=
raw
GitHub
::
Markup
.
render
(
name
,
file
.
data
)
=
raw
GitHub
::
Markup
.
render
(
tree_file
.
name
,
tree_
file
.
data
)
-
else
-
else
.file_content.code
.file_content.code
-
unless
file
.
empty?
-
unless
tree_
file
.
empty?
%div
{
class:
current_user
.
dark_scheme
?
"black"
:
"white"
}
%div
{
class:
current_user
.
dark_scheme
?
"black"
:
"white"
}
=
preserve
do
=
preserve
do
=
raw
file
.
colorize
(
options:
{
linenos:
'True'
})
=
raw
tree_
file
.
colorize
(
options:
{
linenos:
'True'
})
-
else
-
else
%h4
.nothing_here_message
Empty file
%h4
.nothing_here_message
Empty file
-
elsif
file
.
image?
-
elsif
tree_
file
.
image?
.file_content.image_file
.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
-
else
.file_content.blob_file
.file_content.blob_file
...
@@ -37,4 +37,4 @@
...
@@ -37,4 +37,4 @@
%br
%br
=
image_tag
"download.png"
,
width:
64
=
image_tag
"download.png"
,
width:
64
%h3
%h3
Download (
#{
file
.
mb_size
}
)
Download (
#{
tree_
file
.
mb_size
}
)
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