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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
ee6c4a2c
Commit
ee6c4a2c
authored
Feb 19, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve commits UI
parent
6a6a3345
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
11 deletions
+28
-11
CHANGELOG
CHANGELOG
+1
-1
app/assets/stylesheets/sections/commits.scss
app/assets/stylesheets/sections/commits.scss
+18
-3
app/views/projects/commits/_commit.html.haml
app/views/projects/commits/_commit.html.haml
+4
-3
app/views/projects/commits/_commits.html.haml
app/views/projects/commits/_commits.html.haml
+5
-4
No files found.
CHANGELOG
View file @
ee6c4a2c
v 7.9.0 (unreleased)
v 7.9.0 (unreleased)
-
Fix broken access control for note attachments (Hannes Rosenögger)
-
Move labels/milestones tabs to sidebar
v 7.8.0 (unreleased)
v 7.8.0 (unreleased)
- Replace highlight.js with rouge-fork rugments (Stefan Tatschner)
- Replace highlight.js with rouge-fork rugments (Stefan Tatschner)
...
...
app/assets/stylesheets/sections/commits.scss
View file @
ee6c4a2c
...
@@ -136,10 +136,13 @@
...
@@ -136,10 +136,13 @@
/**
/**
* COMMIT ROW
* COMMIT ROW
*/
*/
li
.commit
{
ul
li
.commit
{
padding
:
8px
0
;
.commit-row-title
{
.commit-row-title
{
font-size
:
$list-font-size
;
font-size
:
$list-font-size
;
margin-bottom
:
2px
;
line-height
:
20px
;
margin-bottom
:
5px
;
.notes_count
{
.notes_count
{
float
:
right
;
float
:
right
;
...
@@ -199,7 +202,7 @@ li.commit {
...
@@ -199,7 +202,7 @@ li.commit {
}
}
.committed_ago
{
.committed_ago
{
float
:
right
;
display
:
inline-block
;
}
}
}
}
...
@@ -245,3 +248,15 @@ li.commit {
...
@@ -245,3 +248,15 @@ li.commit {
z-index
:
2
;
z-index
:
2
;
}
}
}
}
.commits-row
{
ul
{
margin
:
0
;
}
.commits-row-date
{
font-size
:
15px
;
line-height
:
20px
;
margin-bottom
:
5px
;
}
}
app/views/projects/commits/_commit.html.haml
View file @
ee6c4a2c
%li
.commit.js-toggle-container
%li
.commit.js-toggle-container
.commit-row-title
.commit-row-title
=
link_to
commit
.
short_id
,
project_commit_path
(
project
,
commit
),
class:
"commit_short_id"
%strong
.str-truncated
%span
.str-truncated
=
link_to_gfm
commit
.
title
,
project_commit_path
(
project
,
commit
.
id
),
class:
"commit-row-message"
=
link_to_gfm
commit
.
title
,
project_commit_path
(
project
,
commit
.
id
),
class:
"commit-row-message"
-
if
commit
.
description?
-
if
commit
.
description?
%a
.text-expander.js-toggle-button
...
%a
.text-expander.js-toggle-button
...
...
@@ -27,5 +25,8 @@
...
@@ -27,5 +25,8 @@
.commit-row-info
.commit-row-info
=
commit_author_link
(
commit
,
avatar:
true
,
size:
16
)
=
commit_author_link
(
commit
,
avatar:
true
,
size:
16
)
authored
.committed_ago
.committed_ago
#{
time_ago_with_tooltip
(
commit
.
committed_date
)
}
#{
time_ago_with_tooltip
(
commit
.
committed_date
)
}
.pull-right
=
link_to
commit
.
short_id
,
project_commit_path
(
project
,
commit
),
class:
"commit_short_id"
app/views/projects/commits/_commits.html.haml
View file @
ee6c4a2c
...
@@ -3,12 +3,13 @@
...
@@ -3,12 +3,13 @@
-
@commits
.
group_by
{
|
c
|
c
.
committed_date
.
to_date
}.
sort
.
reverse
.
each
do
|
day
,
commits
|
-
@commits
.
group_by
{
|
c
|
c
.
committed_date
.
to_date
}.
sort
.
reverse
.
each
do
|
day
,
commits
|
.row.commits-row
.row.commits-row
.col-md-2
.col-md-2
.hidden-xs.hidden-sm
%h
4
%h
5
.commits-row-date
%i
.fa.fa-calendar
%i
.fa.fa-calendar
%span
=
day
.
stamp
(
"28 Aug, 2010"
)
%span
=
day
.
stamp
(
"28 Aug, 2010"
)
%p
=
pluralize
(
commits
.
count
,
'commit'
)
.light
.col-md-10
=
pluralize
(
commits
.
count
,
'commit'
)
.col-md-10.col-sm-12
%ul
.bordered-list
%ul
.bordered-list
=
render
commits
,
project:
project
=
render
commits
,
project:
project
%hr
.lists-separator
%hr
.lists-separator
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