From: James Moger <james.moger@gitblit.com>
Date: Tue, 14 Jan 2014 15:06:56 +0000 (-0500)
Subject: Fixed incorrect tagger identity on dashboards (issue-276)
X-Git-Tag: v1.4.0~128
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5131d611ae044837318b97d206b6a89f2b25b4c4;p=gitblit.git

Fixed incorrect tagger identity on dashboards (issue-276)
---

diff --git a/releases.moxie b/releases.moxie
index 555fdee7..3f753c6e 100644
--- 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 af247733..d19e892a 100644
--- 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));
                                 }