allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject allura git commit: Fix for using authored date instead of committed date in merge requests
Date Tue, 21 Jun 2016 15:44:50 GMT
Repository: allura
Updated Branches:
  refs/heads/master d5e71e1c6 -> 75a25f430


Fix for using authored date instead of committed date in merge requests


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/75a25f43
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/75a25f43
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/75a25f43

Branch: refs/heads/master
Commit: 75a25f43031fed71ef863e20da9dd2cf497e510e
Parents: d5e71e1
Author: Rohan Verma <rohanverma2004@gmail.com>
Authored: Fri Jun 10 09:01:22 2016 +0530
Committer: Dave Brondsema <dave@brondsema.net>
Committed: Tue Jun 21 11:37:08 2016 -0400

----------------------------------------------------------------------
 Allura/allura/templates/widgets/repo/log.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/75a25f43/Allura/allura/templates/widgets/repo/log.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/repo/log.html b/Allura/allura/templates/widgets/repo/log.html
index 39e4dc0..8b9d547 100644
--- a/Allura/allura/templates/widgets/repo/log.html
+++ b/Allura/allura/templates/widgets/repo/log.html
@@ -66,7 +66,7 @@
             </div>
           </td>
           <td style="vertical-align: text-top">
-            {% if commit.committed.date %}{{commit.committed.date|datetimeformat}}{% endif
%}
+            {% if commit.authored.date %}{{commit.authored.date|datetimeformat}}{% endif
%}
           </td>
           <td style="text-align: left; vertical-align: text-top">
               <a class="browse" href="{{app.repo.url_for_commit(commit.id)}}tree{{path}}">


Mime
View raw message