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
Tatuya Kamada
gitlab-ce
Commits
82d16ccf
Commit
82d16ccf
authored
Nov 01, 2011
by
gitlabhq
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
commits + tree in progress
parent
babd0557
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
105 additions
and
49 deletions
+105
-49
app/assets/stylesheets/projects.css.scss
app/assets/stylesheets/projects.css.scss
+36
-5
app/views/commits/index.html.haml
app/views/commits/index.html.haml
+31
-14
app/views/issues/_issues.html.haml
app/views/issues/_issues.html.haml
+1
-1
app/views/layouts/_page_title.html.haml
app/views/layouts/_page_title.html.haml
+0
-5
app/views/layouts/project.html.haml
app/views/layouts/project.html.haml
+0
-1
app/views/projects/_team.html.haml
app/views/projects/_team.html.haml
+1
-1
app/views/projects/_tree.html.haml
app/views/projects/_tree.html.haml
+36
-22
No files found.
app/assets/stylesheets/projects.css.scss
View file @
82d16ccf
...
@@ -335,11 +335,6 @@ input.ssh_project_url {
...
@@ -335,11 +335,6 @@ input.ssh_project_url {
border-width
:
1px
;
border-width
:
1px
;
}
}
tbody
tr
:nth-child
(
2n
)
td
,
tbody
tr
.even
td
{
background
:
none
repeat
scroll
0
0
#F7FBFC
;
border-top
:
1px
solid
#E2EAEE
;
border-bottom
:
1px
solid
#E2EAEE
;
}
.top_menu_count
{
.top_menu_count
{
background
:
none
repeat
scroll
0
0
white
;
background
:
none
repeat
scroll
0
0
white
;
...
@@ -672,6 +667,42 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
...
@@ -672,6 +667,42 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
}
}
.width-65p
{
.width-65p
{
width
:
65%
;
width
:
65%
;
}
pre
.commit_message
{
pre
.commit_message
{
white-space
:
pre-wrap
;
white-space
:
pre-wrap
;
}
}
#container
{
min-height
:
100%
;
}
.ui-selectmenu
{
@include
round-borders-all
(
4px
);
margin-right
:
10px
;
font-size
:
1
.5em
;
height
:auto
;
font-weight
:bold
;
.ui-selectmenu-status
{
padding
:
3px
10px
;
}
}
td
.code
{
width
:
100%
;
.highlight
{
margin-left
:
55px
;
overflow
:auto
;
overflow-y
:hidden
;
}
}
.highlight
pre
{
white-space
:
pre
;
word-wrap
:normal
;
}
.highlighttable
tr
:hover
{
background
:white
;
}
table
.highlighttable
pre
{
line-height
:
16px
!
important
;
font-size
:
12px
!
important
;
}
app/views/commits/index.html.haml
View file @
82d16ccf
-
content_for
(
:body_class
,
"project-page commits-page"
)
-
content_for
(
:body_class
,
"project-page commits-page"
)
%div
%h3
.left
.left
=
form_tag
project_commits_path
(
@project
),
:method
=>
:get
do
=
form_tag
project_commits_path
(
@project
),
:method
=>
:get
do
=
select_tag
"branch"
,
options_for_select
(
@repo
.
heads
.
map
(
&
:name
),
@branch
),
:onchange
=>
"this.form.submit();"
,
:class
=>
""
,
:prompt
=>
"Branches"
=
select_tag
"branch"
,
options_for_select
(
@repo
.
heads
.
map
(
&
:name
),
@branch
),
:onchange
=>
"this.form.submit();"
,
:class
=>
""
,
:prompt
=>
"Branches"
.left
.left.prepend-1
=
form_tag
project_commits_path
(
@project
),
:method
=>
:get
do
=
form_tag
project_commits_path
(
@project
),
:method
=>
:get
do
=
select_tag
"tag"
,
options_for_select
(
@project
.
tags
,
@tag
),
:onchange
=>
"this.form.submit();"
,
:class
=>
""
,
:prompt
=>
"Tags"
=
select_tag
"tag"
,
options_for_select
(
@project
.
tags
,
@tag
),
:onchange
=>
"this.form.submit();"
,
:class
=>
""
,
:prompt
=>
"Tags"
=
text_field_tag
"ssh"
,
@project
.
url_to_repo
,
:class
=>
[
"ssh_project_url"
,
"one_click_select"
]
.clear
.clear
%br
-#%a.right.button{:href => "#"} Download
-#-if can? current_user, :admin_project, @project
%a.right.button.blue{:href => "#"} EDIT
%h2
.icon
%span
%a
.project-name
{
:href
=>
"#"
}
%i
.arrow
>
Project
%d
%a
{
:href
=>
"#"
}
=
@ref
-
if
params
[
:path
]
-
if
params
[
:path
]
%h3
{
:style
=>
"color:#555"
}
/
#{
params
[
:path
]
}
%div
{
:id
=>
dom_id
(
@project
)}
%d
%a
{
:href
=>
"#"
}=
params
[
:path
].
split
(
"/"
).
join
(
" / "
)
%div
{
:id
=>
dom_id
(
@project
)}
=
render
"commits"
=
render
"commits"
app/views/issues/_issues.html.haml
View file @
82d16ccf
%table
.round-borders
#issues-table
%table
.round-borders
#issues-table
%t
r
%t
head
-
if
can?
(
current_user
,
:admin_issue
,
@project
)
&&
!
params
[
:f
]
||
params
[
:f
]
==
"0"
-
if
can?
(
current_user
,
:admin_issue
,
@project
)
&&
!
params
[
:f
]
||
params
[
:f
]
==
"0"
%th
%th
%th
Assignee
%th
Assignee
...
...
app/views/layouts/_page_title.html.haml
View file @
82d16ccf
-
if
content_for?
(
:page_title
)
-
if
content_for?
(
:page_title
)
=
yield
:page_title
=
yield
:page_title
-
else
.grid_4
.container_3
%h2
.icon
%span
=
controller
.
controller_name
.
capitalize
app/views/layouts/project.html.haml
View file @
82d16ccf
...
@@ -41,6 +41,5 @@
...
@@ -41,6 +41,5 @@
-
if
@commit
-
if
@commit
=
link_to
truncate
(
commit_name
(
@project
,
@commit
),
:length
=>
15
),
project_commit_path
(
@project
,
:id
=>
@commit
.
id
),
:class
=>
current_page?
(
:controller
=>
"commits"
,
:action
=>
"show"
,
:project_id
=>
@project
,
:id
=>
@commit
.
id
)
?
"current"
:
nil
=
link_to
truncate
(
commit_name
(
@project
,
@commit
),
:length
=>
15
),
project_commit_path
(
@project
,
:id
=>
@commit
.
id
),
:class
=>
current_page?
(
:controller
=>
"commits"
,
:action
=>
"show"
,
:project_id
=>
@project
,
:id
=>
@commit
.
id
)
?
"current"
:
nil
.project-content
.project-content
=
yield
=
yield
app/views/projects/_team.html.haml
View file @
82d16ccf
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
%div
#new-member-holder
%div
#new-member-holder
=
link_to
"Add new"
,
new_project_team_member_path
(
@project
),
:remote
=>
true
,
:class
=>
"lbutton vm"
=
link_to
"Add new"
,
new_project_team_member_path
(
@project
),
:remote
=>
true
,
:class
=>
"lbutton vm"
%table
.round-borders
#team-table
%table
.round-borders
#team-table
%t
r
%t
head
%th
Name
%th
Name
%th
Email
%th
Email
%th
Web
%th
Web
...
...
app/views/projects/_tree.html.haml
View file @
82d16ccf
%h3
.left
.left
=
form_tag
tree_project_path
(
@project
),
:method
=>
:get
do
=
form_tag
tree_project_path
(
@project
),
:method
=>
:get
do
=
select_tag
"branch"
,
options_for_select
(
@repo
.
heads
.
map
(
&
:name
),
@branch
),
:onchange
=>
"this.form.submit();"
,
:class
=>
""
,
:prompt
=>
"Branches"
=
select_tag
"branch"
,
options_for_select
(
@repo
.
heads
.
map
(
&
:name
),
@branch
),
:onchange
=>
"this.form.submit();"
,
:class
=>
""
,
:prompt
=>
"Branches"
.left
.left.prepend-1
=
form_tag
tree_project_path
(
@project
),
:method
=>
:get
do
=
form_tag
tree_project_path
(
@project
),
:method
=>
:get
do
=
select_tag
"tag"
,
options_for_select
(
@project
.
tags
,
@tag
),
:onchange
=>
"this.form.submit();"
,
:class
=>
""
,
:prompt
=>
"Tags"
=
select_tag
"tag"
,
options_for_select
(
@project
.
tags
,
@tag
),
:onchange
=>
"this.form.submit();"
,
:class
=>
""
,
:prompt
=>
"Tags"
=
text_field_tag
"ssh"
,
@project
.
url_to_repo
,
:class
=>
[
"ssh_project_url"
,
"one_click_select"
]
.clear
.clear
%br
-#%a.right.button{:href => "#"} Download
-#-if can? current_user, :admin_project, @project
%a.right.button.blue{:href => "#"} EDIT
#tree-breadcrumbs
%h2
.icon
%span
=
link_to
tree_project_path
(
@project
,
:path
=>
nil
,
:commit_id
=>
@commit
.
try
(
:id
)),
:remote
=>
true
,
:class
=>
'project-name'
do
%i
.arrow
>
=
@project
.
name
%d
%a
{
:href
=>
"#"
}
=
@ref
%h3
#tree-breadcrumbs
=
link_to
@project
.
name
,
tree_project_path
(
@project
,
:path
=>
nil
,
:commit_id
=>
@commit
.
try
(
:id
)),
:remote
=>
true
-
if
params
[
:path
]
-
if
params
[
:path
]
-
part_path
=
""
-
part_path
=
""
-
params
[
:path
].
split
(
"
\/
"
).
each
do
|
part
|
-
params
[
:path
].
split
(
"
\/
"
).
each
do
|
part
|
...
@@ -19,13 +30,16 @@
...
@@ -19,13 +30,16 @@
-
part_path
=
part
-
part_path
=
part
\/
\/
=
link_to
truncate
(
part
,
:length
=>
40
),
tree_file_project_path
(
@project
,
:path
=>
part_path
,
:commit_id
=>
@commit
.
try
(
:id
),
:branch
=>
@branch
,
:tag
=>
@tag
),
:remote
=>
:true
=
link_to
truncate
(
part
,
:length
=>
40
),
tree_file_project_path
(
@project
,
:path
=>
part_path
,
:commit_id
=>
@commit
.
try
(
:id
),
:branch
=>
@branch
,
:tag
=>
@tag
),
:remote
=>
:true
.clear
#tree-content-holder
#tree-content-holder
-
if
tree
.
is_a?
(
Grit
::
Blob
)
-
if
tree
.
is_a?
(
Grit
::
Blob
)
=
render
:partial
=>
"projects/tree_file"
,
:locals
=>
{
:name
=>
tree
.
name
,
:content
=>
tree
.
data
,
:file
=>
tree
}
=
render
:partial
=>
"projects/tree_file"
,
:locals
=>
{
:name
=>
tree
.
name
,
:content
=>
tree
.
data
,
:file
=>
tree
}
-
else
-
else
-
contents
=
tree
.
contents
-
contents
=
tree
.
contents
%table
#tree-slider
.round-borders
%table
#tree-slider
.round-borders
%t
r
%t
head
%th
Name
%th
Name
%th
Last Update
%th
Last Update
%th
%th
...
...
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