From 0c5cee25a1d9019de2d92427fda886a28076aa01 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 18 Sep 2013 11:31:02 -0400
Subject: [PATCH] Disable but improve the example commit message regexes
---
src/main/java/com/gitblit/models/RepositoryModel.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/models/RepositoryModel.java b/src/main/java/com/gitblit/models/RepositoryModel.java
index a2dab3c..f0354b9 100644
--- a/src/main/java/com/gitblit/models/RepositoryModel.java
+++ b/src/main/java/com/gitblit/models/RepositoryModel.java
@@ -26,8 +26,10 @@
import com.gitblit.Constants.AccessRestrictionType;
import com.gitblit.Constants.AuthorizationControl;
+import com.gitblit.Constants.CommitMessageRenderer;
import com.gitblit.Constants.FederationStrategy;
import com.gitblit.utils.ArrayUtils;
+import com.gitblit.utils.ModelUtils;
import com.gitblit.utils.StringUtils;
/**
@@ -46,10 +48,13 @@
public String description;
public List<String> owners;
public Date lastChange;
+ public String lastChangeAuthor;
public boolean hasCommits;
public boolean showRemoteBranches;
public boolean useTickets;
public boolean useDocs;
+ public boolean useIncrementalPushTags;
+ public String incrementalPushTagPrefix;
public AccessRestrictionType accessRestriction;
public AuthorizationControl authorizationControl;
public boolean allowAuthenticated;
@@ -79,7 +84,9 @@
public boolean verifyCommitter;
public String gcThreshold;
public int gcPeriod;
- public int maxActivityCommits;
+ public int maxActivityCommits;
+ public List<String> metricAuthorExclusions;
+ public CommitMessageRenderer commitMessageRenderer;
public transient boolean isCollectingGarbage;
public Date lastGC;
@@ -99,6 +106,7 @@
this.federationStrategy = FederationStrategy.FEDERATE_THIS;
this.projectPath = StringUtils.getFirstPathElement(name);
this.owners = new ArrayList<String>();
+ this.isBare = true;
addOwner(owner);
}
@@ -172,17 +180,21 @@
}
public boolean isPersonalRepository() {
- return !StringUtils.isEmpty(projectPath) && projectPath.charAt(0) == '~';
+ return !StringUtils.isEmpty(projectPath) && ModelUtils.isPersonalRepository(projectPath);
}
public boolean isUsersPersonalRepository(String username) {
- return !StringUtils.isEmpty(projectPath) && projectPath.equalsIgnoreCase("~" + username);
+ return !StringUtils.isEmpty(projectPath) && ModelUtils.isUsersPersonalRepository(username, projectPath);
}
public boolean allowAnonymousView() {
return !accessRestriction.atLeast(AccessRestrictionType.VIEW);
}
+ public boolean isShowActivity() {
+ return maxActivityCommits > -1;
+ }
+
public boolean isSparkleshared() {
return !StringUtils.isEmpty(sparkleshareId);
}
--
Gitblit v1.9.1