diff options
| author | James Moger <james.moger@gitblit.com> | 2014-01-14 10:06:56 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-01-14 10:06:56 -0500 |
| commit | 5131d611ae044837318b97d206b6a89f2b25b4c4 (patch) | |
| tree | b2caae842070aa7355cfcc7411bd696e025f0ac4 | |
| parent | 3c94742aed91c1e7597e4e75d967c1d7a6bdbb84 (diff) | |
| download | gitblit-5131d611ae044837318b97d206b6a89f2b25b4c4.tar.gz gitblit-5131d611ae044837318b97d206b6a89f2b25b4c4.zip | |
Fixed incorrect tagger identity on dashboards (issue-276)
| -rw-r--r-- | releases.moxie | 2 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/utils/RefLogUtils.java | 4 |
2 files changed, 4 insertions, 2 deletions
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)); } |