From 89e54f3254c396fc924fe7ad81fd48ce25aecd6d Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Sat, 13 Jul 2013 11:05:02 -0400 Subject: [PATCH] Fixed possible NPE in forks page if user account no longer exists --- src/main/java/com/gitblit/models/RepositoryModel.java | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/gitblit/models/RepositoryModel.java b/src/main/java/com/gitblit/models/RepositoryModel.java index 6e1e226..2996265 100644 --- a/src/main/java/com/gitblit/models/RepositoryModel.java +++ b/src/main/java/com/gitblit/models/RepositoryModel.java @@ -46,6 +46,7 @@ public String description; public List<String> owners; public Date lastChange; + public String lastChangeAuthor; public boolean hasCommits; public boolean showRemoteBranches; public boolean useTickets; @@ -81,7 +82,8 @@ public boolean verifyCommitter; public String gcThreshold; public int gcPeriod; - public int maxActivityCommits; + public int maxActivityCommits; + public List<String> metricAuthorExclusions; public transient boolean isCollectingGarbage; public Date lastGC; @@ -186,6 +188,10 @@ return !accessRestriction.atLeast(AccessRestrictionType.VIEW); } + public boolean isShowActivity() { + return maxActivityCommits > -1; + } + public boolean isSparkleshared() { return !StringUtils.isEmpty(sparkleshareId); } -- Gitblit v1.9.1