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
84397ce8
Commit
84397ce8
authored
Nov 01, 2011
by
gitlabhq
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
commits page
parent
09039323
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
73 deletions
+29
-73
app/assets/stylesheets/projects.css.scss
app/assets/stylesheets/projects.css.scss
+0
-48
app/views/commits/_commits.html.haml
app/views/commits/_commits.html.haml
+22
-19
app/views/commits/index.html.haml
app/views/commits/index.html.haml
+1
-0
app/views/layouts/project.html.haml
app/views/layouts/project.html.haml
+6
-6
No files found.
app/assets/stylesheets/projects.css.scss
View file @
84397ce8
...
@@ -102,54 +102,6 @@ table.round-borders {
...
@@ -102,54 +102,6 @@ table.round-borders {
float
:left
;
float
:left
;
}
}
.day-commits-table
{
@include
round-borders-all
(
4px
);
padding
:
4px
0px
;
margin-bottom
:
10px
;
display
:block
;
width
:
100%
;
background
:
#E6F1F6
;
.day-header
{
padding
:
10px
;
h3
{
margin
:
0px
;
}
}
ul
{
display
:block
;
list-style
:none
;
margin
:
0px
;
padding
:
0px
;
li
.commit
{
display
:list-item
;
padding
:
8px
;
margin
:
0px
;
background
:
#F7FBFC
;
border-top
:
1px
solid
#E2EAEE
;
&
:first-child
{
border-top
:
1px
solid
#E2EAEE
;
}
&
:nth-child
(
2n
+
1
)
{
background
:
white
;
}
a
.button
{
width
:
85px
;
padding
:
10px
;
margin
:
0px
;
float
:right
;
}
p
{
margin-bottom
:
3px
;
font-size
:
13px
;
}
}
}
}
@mixin
panel-color
{
@mixin
panel-color
{
background
:
#111
!
important
;
background
:
#111
!
important
;
background
:
-webkit-gradient
(
linear
,
left
top
,
left
bottom
,
from
(
#333
)
,
to
(
#111
))
!
important
;
background
:
-webkit-gradient
(
linear
,
left
top
,
left
bottom
,
from
(
#333
)
,
to
(
#111
))
!
important
;
...
...
app/views/commits/_commits.html.haml
View file @
84397ce8
-
@commits
.
group_by
{
|
c
|
c
.
committed_date
.
to_date
}.
each
do
|
day
,
commits
|
-
@commits
.
group_by
{
|
c
|
c
.
committed_date
.
to_date
}.
each
do
|
day
,
commits
|
%div
{
:class
=>
"commits-date ui-box ui-box-small ui-box-big"
}
.day-commits-table
.day-commits-table
.day-header
%h3
=
day
.
stamp
(
"28 Aug, 2010"
)
%h3
=
day
.
stamp
(
"28 Aug, 2010"
)
%ul
.data
-
commits
.
each
do
|
commit
|
-
commits
.
each
do
|
commit
|
%li
{
:class
=>
"commit"
,
:url
=>
project_commit_path
(
@project
,
:id
=>
commit
.
id
)
}
%a
{
:class
=>
"commit"
,
:href
=>
project_commit_path
(
@project
,
:id
=>
commit
.
id
)
}
%span
.commit-info
%data
.commit-button
=
truncate
(
commit
.
id
.
to_s
,
:length
=>
16
)
%i
%data
.commit-browse
{
:onclick
=>
"location.href='#{tree_project_path(@project, :commit_id => commit.id)}';return false;"
}
Browse Code
-
if
commit
.
author
.
email
-
if
commit
.
author
.
email
=
image_tag
gravatar_icon
(
commit
.
author
.
email
),
:class
=>
"left"
,
:width
=>
40
,
:style
=>
"padding-right:5px;"
=
image_tag
gravatar_icon
(
commit
.
author
.
email
),
:class
=>
"left"
,
:width
=>
40
,
:style
=>
"padding-right:5px;"
-
else
-
else
=
image_tag
"no_avatar.png"
,
:class
=>
"left"
,
:width
=>
40
,
:style
=>
"padding-right:5px;"
=
image_tag
"no_avatar.png"
,
:class
=>
"left"
,
:width
=>
40
,
:style
=>
"padding-right:5px;"
%p
%span
.commit-title
%strong
%strong
=
truncate
(
commit
.
safe_message
,
:length
=>
60
)
=
truncate
(
commit
.
safe_message
,
:length
=>
60
)
=
link_to
"Browse Code"
,
tree_project_path
(
@project
,
:commit_id
=>
commit
.
id
),
:class
=>
"lite_button"
,
:style
=>
"float:right"
%span
.commit-author
=
link_to
truncate
(
commit
.
id
.
to_s
,
:length
=>
16
),
project_commit_path
(
@project
,
:id
=>
commit
.
id
),
:class
=>
"lite_button"
,
:style
=>
"width:120px;float:right"
%strong
=
commit
.
author
%span
%span
.author
=
commit
.
author
=
time_ago_in_words
(
commit
.
committed_date
)
=
time_ago_in_words
(
commit
.
committed_date
)
ago
ago
=
more_commits_link
if
@commits
.
size
>
99
=
more_commits_link
if
@commits
.
size
>
99
app/views/commits/index.html.haml
View file @
84397ce8
-
content_for
(
:body_class
,
"project-page commits-page"
)
%div
%div
%h3
%h3
.left
.left
...
...
app/views/layouts/project.html.haml
View file @
84397ce8
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
=
javascript_tag
do
=
javascript_tag
do
REQ_URI = "
#{
request
.
env
[
"REQUEST_URI"
]
}
";
REQ_URI = "
#{
request
.
env
[
"REQUEST_URI"
]
}
";
REQ_REFFER = "
#{
request
.
env
[
"HTTP_REFERER"
]
}
";
REQ_REFFER = "
#{
request
.
env
[
"HTTP_REFERER"
]
}
";
%body
.project-page
%body
{
:class
=>
content_for?
(
:body_class
)
?
yield
(
:body_class
)
:
'project-page'
,
:id
=>
yield
(
:boyd_id
)}
#container
#container
=
render
:partial
=>
"layouts/flash"
=
render
:partial
=>
"layouts/flash"
=
render
:partial
=>
"layouts/head_panel"
=
render
:partial
=>
"layouts/head_panel"
...
@@ -19,25 +19,25 @@
...
@@ -19,25 +19,25 @@
.fixed
.fixed
%input
.git-url.text
{
:id
=>
""
,
:name
=>
""
,
:readonly
=>
""
,
:type
=>
"text"
,
:value
=>
@project
.
url_to_repo
}
%input
.git-url.text
{
:id
=>
""
,
:name
=>
""
,
:readonly
=>
""
,
:type
=>
"text"
,
:value
=>
@project
.
url_to_repo
}
%aside
%aside
=
link_to
image_tag
(
"home.png"
,
:width
=>
20
)
,
project_path
(
@project
),
:class
=>
current_page?
(
:controller
=>
"projects"
,
:action
=>
"show"
,
:id
=>
@project
)
?
"current"
:
nil
=
link_to
"History"
,
project_path
(
@project
),
:class
=>
current_page?
(
:controller
=>
"projects"
,
:action
=>
"show"
,
:id
=>
@project
)
?
"current"
:
nil
=
link_to
"Tree"
,
tree_project_path
(
@project
),
:class
=>
current_page?
(
:controller
=>
"projects"
,
:action
=>
"tree"
,
:id
=>
@project
)
?
"current"
:
nil
=
link_to
"Tree"
,
tree_project_path
(
@project
),
:class
=>
current_page?
(
:controller
=>
"projects"
,
:action
=>
"tree"
,
:id
=>
@project
)
?
"current"
:
nil
=
link_to
"Commits"
,
project_commits_path
(
@project
),
:class
=>
current_page?
(
:controller
=>
"commits"
,
:action
=>
"index"
,
:project_id
=>
@project
)
?
"current"
:
nil
=
link_to
"Commits"
,
project_commits_path
(
@project
),
:class
=>
current_page?
(
:controller
=>
"commits"
,
:action
=>
"index"
,
:project_id
=>
@project
)
?
"current"
:
nil
=
link_to
team_project_path
(
@project
),
:class
=>
(
current_page?
(
:controller
=>
"projects"
,
:action
=>
"team"
,
:id
=>
@project
)
||
controller
.
controller_name
==
"team_members"
)
?
"current"
:
nil
do
=
link_to
team_project_path
(
@project
),
:class
=>
(
current_page?
(
:controller
=>
"projects"
,
:action
=>
"team"
,
:id
=>
@project
)
||
controller
.
controller_name
==
"team_members"
)
?
"current"
:
nil
do
Team
Team
-
if
@project
.
users_projects
.
count
>
0
-
if
@project
.
users_projects
.
count
>
0
%span
{
:class
=>
"
top_menu_count
"
}=
@project
.
users_projects
.
count
%span
{
:class
=>
"
number
"
}=
@project
.
users_projects
.
count
=
link_to
project_issues_path
(
@project
),
:class
=>
(
controller
.
controller_name
==
"issues"
)
?
"current"
:
nil
do
=
link_to
project_issues_path
(
@project
),
:class
=>
(
controller
.
controller_name
==
"issues"
)
?
"current"
:
nil
do
Issues
Issues
-
if
@project
.
issues
.
opened
.
count
>
0
-
if
@project
.
issues
.
opened
.
count
>
0
%span
{
:class
=>
"
top_menu_count
"
}=
@project
.
issues
.
opened
.
count
%span
{
:class
=>
"
number
"
}=
@project
.
issues
.
opened
.
count
=
link_to
wall_project_path
(
@project
),
:class
=>
current_page?
(
:controller
=>
"projects"
,
:action
=>
"wall"
,
:id
=>
@project
)
?
"current"
:
nil
do
=
link_to
wall_project_path
(
@project
),
:class
=>
current_page?
(
:controller
=>
"projects"
,
:action
=>
"wall"
,
:id
=>
@project
)
?
"current"
:
nil
do
Wall
Wall
-
if
@project
.
common_notes
.
count
>
0
-
if
@project
.
common_notes
.
count
>
0
%span
{
:class
=>
"
top_menu_count
"
}=
@project
.
common_notes
.
count
%span
{
:class
=>
"
number
"
}=
@project
.
common_notes
.
count
=
link_to
project_snippets_path
(
@project
),
:class
=>
(
controller
.
controller_name
==
"snippets"
)
?
"current"
:
nil
do
=
link_to
project_snippets_path
(
@project
),
:class
=>
(
controller
.
controller_name
==
"snippets"
)
?
"current"
:
nil
do
Snippets
Snippets
-
if
@project
.
snippets
.
count
>
0
-
if
@project
.
snippets
.
count
>
0
%span
{
:class
=>
"
top_menu_count
"
}=
@project
.
snippets
.
non_expired
.
count
%span
{
:class
=>
"
number
"
}=
@project
.
snippets
.
non_expired
.
count
-
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
...
...
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