From 6b18b0761b726fd9aef1ebcc21b760378f7d4b5c Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 16 Jun 2014 17:36:12 -0400 Subject: [PATCH] Merge release 1.6.0 --- src/main/java/com/gitblit/models/DailyLogEntry.java | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/gitblit/models/DailyLogEntry.java b/src/main/java/com/gitblit/models/DailyLogEntry.java index 41f1381..a6bc6a4 100644 --- a/src/main/java/com/gitblit/models/DailyLogEntry.java +++ b/src/main/java/com/gitblit/models/DailyLogEntry.java @@ -25,7 +25,7 @@ * Model class to simulate a push for presentation in the push log news feed * for a repository that does not have a Gitblit push log. Commits are grouped * by date and may be additionally split by ref. - * + * * @author James Moger */ public class DailyLogEntry extends RefLogEntry implements Serializable { @@ -45,7 +45,7 @@ if (getAuthorCount() == 1) { return getCommits().get(0).getCommitterIdent(); } - + return super.getCommitterIdent(); } @@ -54,20 +54,21 @@ if (getAuthorCount() == 1) { return getCommits().get(0).getAuthorIdent(); } - + return super.getAuthorIdent(); } - + /** * Tracks the change type for the specified ref. - * + * * @param ref * @param type * @param oldId * @param newId */ + @Override public void updateRef(String ref, ReceiveCommand.Type type, String oldId, String newId) { - // daily digests are filled from most recent to oldest + // daily digests are filled from most recent to oldest String preservedNewId = getNewId(ref); if (preservedNewId == null) { // no preserved new id, this is newest commit -- Gitblit v1.9.1