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
20721eff
Commit
20721eff
authored
Jan 29, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bootstrap: Commits page
parent
ae5faf0f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
18 deletions
+22
-18
app/assets/stylesheets/top_panel.scss
app/assets/stylesheets/top_panel.scss
+0
-1
app/views/commits/_commits.html.haml
app/views/commits/_commits.html.haml
+12
-13
app/views/commits/index.html.haml
app/views/commits/index.html.haml
+9
-3
app/views/layouts/_project_side.html.haml
app/views/layouts/_project_side.html.haml
+1
-1
No files found.
app/assets/stylesheets/top_panel.scss
View file @
20721eff
...
@@ -109,7 +109,6 @@ body header {
...
@@ -109,7 +109,6 @@ body header {
margin
:
0
15px
;
margin
:
0
15px
;
padding
:
3px
;
padding
:
3px
;
border-radius
:
3px
;
border-radius
:
3px
;
float
:left
;
}
}
...
...
app/views/commits/_commits.html.haml
View file @
20721eff
...
@@ -2,19 +2,18 @@
...
@@ -2,19 +2,18 @@
%div
{
:class
=>
"commits-date ui-box ui-box-small ui-box-big"
}
%div
{
:class
=>
"commits-date ui-box ui-box-small ui-box-big"
}
.day-commits-table
.day-commits-table
%h5
.underlined
=
day
.
stamp
(
"28 Aug, 2010"
)
%h5
.underlined
=
day
.
stamp
(
"28 Aug, 2010"
)
%br
%ul
.unstyled
%ul
.unstyled
-
commits
.
each
do
|
commit
|
-
commits
.
each
do
|
commit
|
%li
.wll
%li
.entry
%a
{
:class
=>
"update-item"
,
:href
=>
project_commit_path
(
@project
,
:id
=>
commit
.
id
)
}
=
link_to
project_commit_path
(
@project
,
:id
=>
commit
.
id
)
do
.right.btn
%div
=
truncate
(
commit
.
id
.
to_s
,
:length
=>
10
)
»
=
image_tag
gravatar_icon
(
commit
.
author_email
),
:class
=>
"avatar"
,
:width
=>
32
%span
.update-author
%strong
=
commit
.
author_name
–
=
time_ago_in_words
(
commit
.
committed_date
)
ago
%p
%strong
%strong
=
truncate
(
commit
.
safe_message
,
:length
=>
50
)
=
truncate
commit
.
id
.
to_s
,
:length
=>
10
–
=
image_tag
gravatar_icon
(
commit
.
author_email
),
:class
=>
""
,
:width
=>
16
=
truncate
(
commit
.
safe_message
,
:length
=>
50
)
%span
.right.cgray
=
time_ago_in_words
(
commit
.
committed_date
)
ago
app/views/commits/index.html.haml
View file @
20721eff
-
if
current_user
.
private_token
%h3
=
content_for
:rss_icon
do
Commits
.rss-icon
-
if
current_user
.
private_token
%span
.rss-icon
=
link_to
project_commits_path
(
@project
,
:atom
,
{
:private_token
=>
current_user
.
private_token
,
:ref
=>
@ref
})
do
=
link_to
project_commits_path
(
@project
,
:atom
,
{
:private_token
=>
current_user
.
private_token
,
:ref
=>
@ref
})
do
=
image_tag
"Rss-UI.PNG"
,
:width
=>
22
,
:title
=>
"feed"
=
image_tag
"Rss-UI.PNG"
,
:width
=>
22
,
:title
=>
"feed"
=
form_tag
switch_project_refs_path
(
@project
),
:method
=>
:get
,
:class
=>
"project-refs-form right"
do
=
select_tag
"ref"
,
grouped_options_refs
,
:onchange
=>
"$(this.form).trigger('submit');"
,
:class
=>
"project-refs-select"
=
hidden_field_tag
:destination
,
"commits"
%hr
-
if
params
[
:path
]
-
if
params
[
:path
]
%ul
.breadcrumb
%ul
.breadcrumb
...
@@ -24,4 +29,5 @@
...
@@ -24,4 +29,5 @@
:javascript
:javascript
$
(
function
(){
$
(
function
(){
CommitsList
.
init
(
"
#{
@ref
}
"
,
20
);
CommitsList
.
init
(
"
#{
@ref
}
"
,
20
);
$
(
'
.project-refs-select
'
).
chosen
();
});
});
app/views/layouts/_project_side.html.haml
View file @
20721eff
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
-
if
@project
.
repo_exists?
-
if
@project
.
repo_exists?
=
link_to
"Repository"
,
project_repository_path
(
@project
),
:class
=>
repository_tab_class
=
link_to
"Repository"
,
project_repository_path
(
@project
),
:class
=>
repository_tab_class
=
link_to
"Tree"
,
tree_project_ref_path
(
@project
),
:class
=>
tree_tab_class
=
link_to
"Tree"
,
tree_project_ref_path
(
@project
,
@project
.
root_ref
),
:class
=>
tree_tab_class
=
link_to
"Commits"
,
project_commits_path
(
@project
),
:class
=>
(
controller
.
controller_name
==
"commits"
)
?
"current"
:
nil
=
link_to
"Commits"
,
project_commits_path
(
@project
),
:class
=>
(
controller
.
controller_name
==
"commits"
)
?
"current"
:
nil
=
link_to
"Network"
,
graph_project_path
(
@project
),
:class
=>
current_page?
(
:controller
=>
"projects"
,
:action
=>
"graph"
,
:id
=>
@project
)
?
"current"
:
nil
=
link_to
"Network"
,
graph_project_path
(
@project
),
:class
=>
current_page?
(
:controller
=>
"projects"
,
:action
=>
"graph"
,
:id
=>
@project
)
?
"current"
:
nil
=
link_to
project_issues_filter_path
(
@project
),
:class
=>
(
controller
.
controller_name
==
"issues"
)
?
"current"
:
nil
do
=
link_to
project_issues_filter_path
(
@project
),
:class
=>
(
controller
.
controller_name
==
"issues"
)
?
"current"
:
nil
do
...
...
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