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
eb2a25f7
Commit
eb2a25f7
authored
Jan 12, 2012
by
Dmitry Kalinkin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added both committer and author display for commits list
parent
3c9d7b70
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
3 deletions
+22
-3
app/assets/stylesheets/commits.css.scss
app/assets/stylesheets/commits.css.scss
+2
-2
app/models/commit.rb
app/models/commit.rb
+10
-0
app/views/commits/_commits.html.haml
app/views/commits/_commits.html.haml
+10
-1
No files found.
app/assets/stylesheets/commits.css.scss
View file @
eb2a25f7
...
@@ -79,8 +79,8 @@ pre.commit_message {
...
@@ -79,8 +79,8 @@ pre.commit_message {
/** COMMIT BLOCK **/
/** COMMIT BLOCK **/
.commit-title
{
display
:
block
;}
.commit-title
{
display
:
block
;}
.commit-title
{
margin-bottom
:
10px
}
.commit-title
{
margin-bottom
:
10px
}
.commit-author
{
color
:
#999
;
font-weight
:
normal
;
font-style
:
italic
;}
.commit-author
,
.commit-committer
{
display
:
block
;
color
:
#999
;
font-weight
:
normal
;
font-style
:
italic
;}
.commit-author
strong
{
font-weight
:
bold
;
font-style
:
normal
;}
.commit-author
strong
,
.commit-committer
strong
{
font-weight
:
bold
;
font-style
:
normal
;}
/** bordered list **/
/** bordered list **/
ul
.bordered-list
{
ul
.bordered-list
{
...
...
app/models/commit.rb
View file @
eb2a25f7
...
@@ -5,10 +5,12 @@ class Commit
...
@@ -5,10 +5,12 @@ class Commit
attr_accessor
:refs
attr_accessor
:refs
delegate
:message
,
delegate
:message
,
:authored_date
,
:committed_date
,
:committed_date
,
:parents
,
:parents
,
:sha
,
:sha
,
:date
,
:date
,
:committer
,
:author
,
:author
,
:message
,
:message
,
:diffs
,
:diffs
,
...
@@ -37,6 +39,14 @@ class Commit
...
@@ -37,6 +39,14 @@ class Commit
author
.
name
author
.
name
end
end
def
committer_name
committer
.
name
end
def
committer_email
committer
.
email
end
def
prev_commit
def
prev_commit
parents
.
first
parents
.
first
end
end
...
...
app/views/commits/_commits.html.haml
View file @
eb2a25f7
...
@@ -19,6 +19,15 @@
...
@@ -19,6 +19,15 @@
%strong
%strong
=
truncate
(
commit
.
safe_message
,
:length
=>
70
)
=
truncate
(
commit
.
safe_message
,
:length
=>
70
)
%span
.commit-author
%span
.commit-author
Authored by
%strong
=
commit
.
author_name
%strong
=
commit
.
author_name
=
time_ago_in_words
(
commit
.
authored_date
)
ago
-
if
commit
.
author_name
!=
commit
.
committer_name
or
commit
.
author_email
!=
commit
.
committer_email
or
commit
.
authored_date
!=
commit
.
committed_date
%span
.commit-committer
Committed by
%strong
=
commit
.
committer_name
=
time_ago_in_words
(
commit
.
committed_date
)
=
time_ago_in_words
(
commit
.
committed_date
)
ago
ago
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