From eb2a25f733e0ed39788022fbe901cb69967d9878 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 12 Jan 2012 03:12:49 +0400
Subject: [PATCH] Added both committer and author display for commits list

---
 app/assets/stylesheets/commits.css.scss |  4 ++--
 app/models/commit.rb                    | 10 ++++++++++
 app/views/commits/_commits.html.haml    | 11 ++++++++++-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/commits.css.scss b/app/assets/stylesheets/commits.css.scss
index 2b94fb9d..6d0b0710 100644
--- a/app/assets/stylesheets/commits.css.scss
+++ b/app/assets/stylesheets/commits.css.scss
@@ -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 { 
diff --git a/app/models/commit.rb b/app/models/commit.rb
index 695dfa52..7f06f4e6 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -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
diff --git a/app/views/commits/_commits.html.haml b/app/views/commits/_commits.html.haml
index 108d1b4c..f1537d1c 100644
--- a/app/views/commits/_commits.html.haml
+++ b/app/views/commits/_commits.html.haml
@@ -19,6 +19,15 @@
               %strong
                 = truncate(commit.safe_message, :length => 70)
             %span.commit-author
+              Authored by
+              &nbsp;
               %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
+                &nbsp;
+                %strong= commit.committer_name
+                = time_ago_in_words(commit.committed_date)
+                ago