From 0256e6aa26ebb51416d290d772897caf84a1cd82 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 13 Jan 2012 08:16:40 -0500
Subject: [PATCH] Merge branch 'master' into issues
---
src/com/gitblit/models/RepositoryModel.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/com/gitblit/models/RepositoryModel.java b/src/com/gitblit/models/RepositoryModel.java
index e85fd6a..ad0adaa 100644
--- a/src/com/gitblit/models/RepositoryModel.java
+++ b/src/com/gitblit/models/RepositoryModel.java
@@ -22,6 +22,7 @@
import com.gitblit.Constants.AccessRestrictionType;
import com.gitblit.Constants.FederationStrategy;
+import com.gitblit.utils.StringUtils;
/**
* RepositoryModel is a serializable model class that represents a Gitblit
@@ -49,10 +50,17 @@
public FederationStrategy federationStrategy;
public List<String> federationSets;
public boolean isFederated;
+ public boolean skipSizeCalculation;
+ public boolean skipSummaryMetrics;
public String frequency;
public String origin;
public String size;
+ public List<String> preReceiveScripts;
+ public List<String> postReceiveScripts;
+ public List<String> mailingLists;
+ private String displayName;
+
public RepositoryModel() {
this("", "", "", new Date(0));
}
@@ -69,11 +77,14 @@
@Override
public String toString() {
- return name;
+ if (displayName == null) {
+ displayName = StringUtils.stripDotGit(name);
+ }
+ return displayName;
}
@Override
public int compareTo(RepositoryModel o) {
- return name.compareTo(o.name);
+ return StringUtils.compareRepositoryNames(name, o.name);
}
}
\ No newline at end of file
--
Gitblit v1.9.1