Added both committer and author display for commits list
This commit is contained in:
parent
3c9d7b7077
commit
eb2a25f733
3 changed files with 22 additions and 3 deletions
|
@ -79,8 +79,8 @@ pre.commit_message {
|
|||
/** COMMIT BLOCK **/
|
||||
.commit-title{display: block;}
|
||||
.commit-title{margin-bottom: 10px}
|
||||
.commit-author{color: #999; font-weight: normal; font-style: italic;}
|
||||
.commit-author strong{font-weight: bold; font-style: normal;}
|
||||
.commit-author, .commit-committer{display: block;color: #999; font-weight: normal; font-style: italic;}
|
||||
.commit-author strong, .commit-committer strong{font-weight: bold; font-style: normal;}
|
||||
|
||||
/** bordered list **/
|
||||
ul.bordered-list {
|
||||
|
|
|
@ -5,10 +5,12 @@ class Commit
|
|||
attr_accessor :refs
|
||||
|
||||
delegate :message,
|
||||
:authored_date,
|
||||
:committed_date,
|
||||
:parents,
|
||||
:sha,
|
||||
:date,
|
||||
:committer,
|
||||
:author,
|
||||
:message,
|
||||
:diffs,
|
||||
|
@ -37,6 +39,14 @@ class Commit
|
|||
author.name
|
||||
end
|
||||
|
||||
def committer_name
|
||||
committer.name
|
||||
end
|
||||
|
||||
def committer_email
|
||||
committer.email
|
||||
end
|
||||
|
||||
def prev_commit
|
||||
parents.first
|
||||
end
|
||||
|
|
|
@ -19,6 +19,15 @@
|
|||
%strong
|
||||
= truncate(commit.safe_message, :length => 70)
|
||||
%span.commit-author
|
||||
Authored by
|
||||
|
||||
%strong= commit.author_name
|
||||
= time_ago_in_words(commit.committed_date)
|
||||
= 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)
|
||||
ago
|
||||
|
|
Loading…
Reference in a new issue