Fixed incorrect tagger identity on dashboards (issue-276)

diff --git a/releases.moxie b/releases.moxie
index 555fdee7959c3587e09ec33cc3e3b30d3ba7eda1..3f753c6eae391378f2e66c80d6cdbecc36474fbb 100644 (file)
--- a/releases.moxie
+++ b/releases.moxie
@@ -10,6 +10,7 @@ r20: {
     text: ~
     security: ~
     fixes:
+       - Fixed incorrect tagger attribution in the dashboard (issue-276)
        - Fixed support for implied SSH urls in web.otherUrls (issue-311)
        - Bind LDAP connection after establishing TLS initialization (issue-343)
        - Fixed NPE when attempting to add a permission without a registrant (issue-344)
@@ -91,6 +92,7 @@ r20: {
        - David Ostrovsky
        - Alex Lewis
        - Marc Strapetz
+       - Gareth Collins
 }
 
 #

diff --git a/src/main/java/com/gitblit/utils/RefLogUtils.java b/src/main/java/com/gitblit/utils/RefLogUtils.java
index af24773328a20978438694cbbb969303b7c22087..d19e892a6bb45855b133b36fe55cac77fb8e1815 100644 (file)
--- a/src/main/java/com/gitblit/utils/RefLogUtils.java
+++ b/src/main/java/com/gitblit/utils/RefLogUtils.java
@@ -642,7 +642,7 @@ public class RefLogUtils {
                             if (ref.getName().startsWith(Constants.R_TAGS)) {
                                 // treat tags as special events in the log
                                 if (!tags.containsKey(dateStr)) {
-                                               UserModel tagUser = newUserModelFrom(commit.getAuthorIdent());
+                                               UserModel tagUser = newUserModelFrom(ref.getAuthorIdent());
                                                Date tagDate = commit.getAuthorIdent().getWhen();
                                                tags.put(dateStr, new DailyLogEntry(repositoryName, tagDate, tagUser));
                                 }
@@ -653,7 +653,7 @@ public class RefLogUtils {
                             } else if (ref.getName().startsWith(Constants.R_PULL)) {
                                 // treat pull requests as special events in the log
                                 if (!pulls.containsKey(dateStr)) {
-                                               UserModel commitUser = newUserModelFrom(commit.getAuthorIdent());
+                                               UserModel commitUser = newUserModelFrom(ref.getAuthorIdent());
                                                Date commitDate = commit.getAuthorIdent().getWhen();
                                                pulls.put(dateStr, new DailyLogEntry(repositoryName, commitDate, commitUser));
                                 }