Browse Source

Fixed incorrect tagger identity on dashboards (issue-276)

tags/v1.4.0
James Moger 10 years ago
parent
commit
5131d611ae
2 changed files with 4 additions and 2 deletions
  1. 2
    0
      releases.moxie
  2. 2
    2
      src/main/java/com/gitblit/utils/RefLogUtils.java

+ 2
- 0
releases.moxie View File

text: ~ text: ~
security: ~ security: ~
fixes: fixes:
- Fixed incorrect tagger attribution in the dashboard (issue-276)
- Fixed support for implied SSH urls in web.otherUrls (issue-311) - Fixed support for implied SSH urls in web.otherUrls (issue-311)
- Bind LDAP connection after establishing TLS initialization (issue-343) - Bind LDAP connection after establishing TLS initialization (issue-343)
- Fixed NPE when attempting to add a permission without a registrant (issue-344) - Fixed NPE when attempting to add a permission without a registrant (issue-344)
- David Ostrovsky - David Ostrovsky
- Alex Lewis - Alex Lewis
- Marc Strapetz - Marc Strapetz
- Gareth Collins
} }


# #

+ 2
- 2
src/main/java/com/gitblit/utils/RefLogUtils.java View File

if (ref.getName().startsWith(Constants.R_TAGS)) { if (ref.getName().startsWith(Constants.R_TAGS)) {
// treat tags as special events in the log // treat tags as special events in the log
if (!tags.containsKey(dateStr)) { if (!tags.containsKey(dateStr)) {
UserModel tagUser = newUserModelFrom(commit.getAuthorIdent());
UserModel tagUser = newUserModelFrom(ref.getAuthorIdent());
Date tagDate = commit.getAuthorIdent().getWhen(); Date tagDate = commit.getAuthorIdent().getWhen();
tags.put(dateStr, new DailyLogEntry(repositoryName, tagDate, tagUser)); tags.put(dateStr, new DailyLogEntry(repositoryName, tagDate, tagUser));
} }
} else if (ref.getName().startsWith(Constants.R_PULL)) { } else if (ref.getName().startsWith(Constants.R_PULL)) {
// treat pull requests as special events in the log // treat pull requests as special events in the log
if (!pulls.containsKey(dateStr)) { if (!pulls.containsKey(dateStr)) {
UserModel commitUser = newUserModelFrom(commit.getAuthorIdent());
UserModel commitUser = newUserModelFrom(ref.getAuthorIdent());
Date commitDate = commit.getAuthorIdent().getWhen(); Date commitDate = commit.getAuthorIdent().getWhen();
pulls.put(dateStr, new DailyLogEntry(repositoryName, commitDate, commitUser)); pulls.put(dateStr, new DailyLogEntry(repositoryName, commitDate, commitUser));
} }

Loading…
Cancel
Save