From 81afea350d580e13d7ae6a697bb91756ac5abeca Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Thu, 19 May 2016 12:01:41 +0900
Subject: [PATCH] (refs #1195)Fix date in the commit list

---
 src/main/twirl/gitbucket/core/pulls/commits.scala.html |  8 ++++----
 src/main/twirl/gitbucket/core/repo/commits.scala.html  | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/twirl/gitbucket/core/pulls/commits.scala.html b/src/main/twirl/gitbucket/core/pulls/commits.scala.html
index cfe67edbf..8a863926d 100644
--- a/src/main/twirl/gitbucket/core/pulls/commits.scala.html
+++ b/src/main/twirl/gitbucket/core/pulls/commits.scala.html
@@ -27,13 +27,13 @@
               <pre id="description-@commit.id" style="display: none;" class="commit-description">@link(commit.description.get, repository)</pre>
             }
             <div>
-              @user(commit.authorName, commit.authorEmailAddress, "username")
-              <span class="muted">authored @helper.html.datetimeago(commit.authorTime)</span>
               @if(commit.isDifferentFromAuthor) {
+                @user(commit.authorName, commit.authorEmailAddress, "username")
+                <span class="muted">authored @helper.html.datetimeago(commit.authorTime)</span>
                 <span class="octicon octicon-arrow-right" style="margin-top : -2px;"></span>
-                @user(commit.committerName, commit.committerEmailAddress, "username")
-                <span class="muted">committed @helper.html.datetimeago(commit.authorTime)</span>
               }
+              @user(commit.committerName, commit.committerEmailAddress, "username")
+              <span class="muted">committed @helper.html.datetimeago(commit.commitTime)</span>
             </div>
           </div>
         </div>
diff --git a/src/main/twirl/gitbucket/core/repo/commits.scala.html b/src/main/twirl/gitbucket/core/repo/commits.scala.html
index ac16baa79..d5ca9f0b6 100644
--- a/src/main/twirl/gitbucket/core/repo/commits.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/commits.scala.html
@@ -56,14 +56,14 @@
                 @if(commit.description.isDefined){
                   <pre id="description-@commit.id" style="display: none;" class="commit-description">@link(commit.description.get, repository)</pre>
                 }
-                <div>
-                  @user(commit.authorName, commit.authorEmailAddress, "username")
-                  <span class="muted">authored @helper.html.datetimeago(commit.authorTime)</span>
+                  <div>
                   @if(commit.isDifferentFromAuthor) {
+                    @user(commit.authorName, commit.authorEmailAddress, "username")
+                    <span class="muted">authored @helper.html.datetimeago(commit.authorTime)</span>
                     <span class="octicon octicon-arrow-right" style="margin-top : -2px;"></span>
-                    @user(commit.committerName, commit.committerEmailAddress, "username")
-                    <span class="muted">committed @helper.html.datetimeago(commit.authorTime)</span>
                   }
+                  @user(commit.committerName, commit.committerEmailAddress, "username")
+                  <span class="muted">committed @helper.html.datetimeago(commit.commitTime)</span>
                 </div>
               </div>
             </div>