BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
a7bcc2eb
Commit
a7bcc2eb
authored
Feb 14, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
submodules displayed for tree view
parent
c062e56b
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
38 additions
and
9 deletions
+38
-9
submodule.png
app/assets/images/submodule.png
+0
-0
common.scss
app/assets/stylesheets/common.scss
+8
-1
tree.scss
app/assets/stylesheets/tree.scss
+4
-0
commits_controller.rb
app/controllers/commits_controller.rb
+1
-0
_text_file.html.haml
app/views/commits/_text_file.html.haml
+9
-7
_submodule_item.html.haml
app/views/refs/_submodule_item.html.haml
+13
-0
_tree.html.haml
app/views/refs/_tree.html.haml
+2
-0
_tree_item.html.haml
app/views/refs/_tree_item.html.haml
+1
-1
No files found.
app/assets/images/submodule.png
0 → 100644
View file @
a7bcc2eb
641 Bytes
app/assets/stylesheets/common.scss
View file @
a7bcc2eb
...
...
@@ -234,12 +234,19 @@ img.lil_av {
border-color
:
#ddd
;
h5
{
padding
:
5px
10px
;
padding
:
0
10px
;
background
:
#f5f5f5
;
border-bottom
:
1px
solid
#ccc
;
@include
round-borders-top
(
4px
);
border-top
:none
;
}
li
{
padding
:
10px
;
&
:first-child
{
@include
round-borders-top
(
4px
);
border-top
:none
;
}
}
}
app/assets/stylesheets/tree.scss
View file @
a7bcc2eb
...
...
@@ -144,3 +144,7 @@ table.highlighttable .linenodiv pre {
background
:
#f5f5f5
;
}
}
.tree-commit-link
{
color
:
#333
;
}
app/controllers/commits_controller.rb
View file @
a7bcc2eb
...
...
@@ -28,6 +28,7 @@ class CommitsController < ApplicationController
@notes
=
project
.
commit_notes
(
@commit
).
fresh
.
limit
(
20
)
@note
=
@project
.
build_commit_note
(
@commit
)
@comments_allowed
=
true
@line_notes
=
project
.
commit_line_notes
(
@commit
)
respond_to
do
|
format
|
...
...
app/views/commits/_text_file.html.haml
View file @
a7bcc2eb
...
...
@@ -8,12 +8,14 @@
-
else
%td
.old_line
=
link_to
raw
(
type
==
"new"
?
" "
:
line_old
),
"#
#{
line_code
}
"
,
:id
=>
line_code
=
link_to
""
,
"#"
,
:class
=>
"line_note_link"
,
"line_code"
=>
line_code
,
:title
=>
"Add note for this line"
-
if
@comments_allowed
=
link_to
""
,
"#"
,
:class
=>
"line_note_link"
,
"line_code"
=>
line_code
,
:title
=>
"Add note for this line"
%td
.new_line
=
link_to
raw
(
type
==
"old"
?
" "
:
line_new
)
,
"#
#{
line_code
}
"
,
:id
=>
line_code
%td
.line_content
{
:class
=>
"noteable_line #{type} #{line_code}"
,
"line_code"
=>
line_code
}=
raw
"
#{
line
}
"
-
comments
=
@line_notes
.
select
{
|
n
|
n
.
line_code
==
line_code
}.
sort_by
(
&
:created_at
).
reverse
-
unless
comments
.
empty?
-
comments
.
each
do
|
note
|
=
render
"notes/per_line_show"
,
:note
=>
note
-
@line_notes
.
reject!
{
|
n
|
n
==
note
}
-
if
@comments_allowed
-
comments
=
@line_notes
.
select
{
|
n
|
n
.
line_code
==
line_code
}.
sort_by
(
&
:created_at
).
reverse
-
unless
comments
.
empty?
-
comments
.
each
do
|
note
|
=
render
"notes/per_line_show"
,
:note
=>
note
-
@line_notes
.
reject!
{
|
n
|
n
==
note
}
app/views/refs/_submodule_item.html.haml
0 → 100644
View file @
a7bcc2eb
-
url
=
content
.
url
(
@ref
)
-
name
=
content
.
basename
-
return
unless
url
%tr
{
:class
=>
"tree-item"
,
:url
=>
url
}
%td
.tree-item-file-name
=
image_tag
"submodule.png"
%strong
=
truncate
(
name
,
:length
=>
40
)
%td
%code
=
content
.
id
[
0
..
10
]
%td
=
link_to
truncate
(
url
,
:length
=>
40
),
url
app/views/refs/_tree.html.haml
View file @
a7bcc2eb
...
...
@@ -39,6 +39,8 @@
=
render
:partial
=>
"refs/tree_item"
,
:locals
=>
{
:content
=>
content
}
-
contents
.
select
{
|
i
|
i
.
is_a?
(
Grit
::
Blob
)}.
each
do
|
content
|
=
render
:partial
=>
"refs/tree_item"
,
:locals
=>
{
:content
=>
content
}
-
contents
.
select
{
|
i
|
i
.
is_a?
(
Grit
::
Submodule
)}.
each
do
|
content
|
=
render
:partial
=>
"refs/submodule_item"
,
:locals
=>
{
:content
=>
content
}
-
if
content
=
contents
.
select
{
|
c
|
c
.
is_a?
(
Grit
::
Blob
)
and
c
.
name
=~
/^readme/i
}.
first
#tree-readme-holder
...
...
app/views/refs/_tree_item.html.haml
View file @
a7bcc2eb
...
...
@@ -15,4 +15,4 @@
-
tm
=
@project
.
team_member_by_name_or_email
(
content_commit
.
author_email
,
content_commit
.
author_name
)
-
if
tm
=
link_to
"[
#{
tm
.
user_name
}
]"
,
project_team_member_path
(
@project
,
tm
)
=
link_to
truncate
(
content_commit
.
safe_message
,
:length
=>
tm
?
20
:
4
0
),
project_commit_path
(
@project
,
content_commit
.
id
),
:class
=>
"tree-commit-link"
=
link_to
truncate
(
content_commit
.
safe_message
,
:length
=>
tm
?
30
:
5
0
),
project_commit_path
(
@project
,
content_commit
.
id
),
:class
=>
"tree-commit-link"
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