James Moger
2014-01-14 5131d611ae044837318b97d206b6a89f2b25b4c4
Fixed incorrect tagger identity on dashboards (issue-276)
2 files modified
6 ■■■■■ changed files
releases.moxie 2 ●●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/utils/RefLogUtils.java 4 ●●●● patch | view | raw | blame | history
releases.moxie
@@ -10,6 +10,7 @@
    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 @@
    - David Ostrovsky
    - Alex Lewis
    - Marc Strapetz
    - Gareth Collins
}
#
src/main/java/com/gitblit/utils/RefLogUtils.java
@@ -642,7 +642,7 @@
                            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 @@
                            } 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));
                                }