From a502d96a860456ec5e8c96761db70f7cabb74751 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Sat, 30 Apr 2016 04:19:14 -0400
Subject: [PATCH] Merge pull request #1073 from gitblit/1062-DocEditorUpdates
---
src/main/java/com/gitblit/models/DailyLogEntry.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/gitblit/models/DailyLogEntry.java b/src/main/java/com/gitblit/models/DailyLogEntry.java
index a459d76..a6bc6a4 100644
--- a/src/main/java/com/gitblit/models/DailyLogEntry.java
+++ b/src/main/java/com/gitblit/models/DailyLogEntry.java
@@ -25,10 +25,10 @@
* 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 PushLogEntry implements Serializable {
+public class DailyLogEntry extends RefLogEntry implements Serializable {
private static final long serialVersionUID = 1L;
@@ -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