From e28b2f68fc38e4976a0e8bc11af45834bbde940c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 17 Mar 2012 11:13:46 -0400
Subject: [PATCH] Update to Bootstrap 2.0.2
---
src/com/gitblit/GitBlit.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java
index 15b69ec..b2e53d6 100644
--- a/src/com/gitblit/GitBlit.java
+++ b/src/com/gitblit/GitBlit.java
@@ -812,6 +812,8 @@
"gitblit", null, "postReceiveScript")));
model.mailingLists = new ArrayList<String>(Arrays.asList(config.getStringList(
"gitblit", null, "mailingList")));
+ model.indexedBranches = new ArrayList<String>(Arrays.asList(config.getStringList(
+ "gitblit", null, "indexBranch")));
}
model.HEAD = JGitUtils.getHEADRef(r);
model.availableRefs = JGitUtils.getAvailableHeadTargets(r);
@@ -955,6 +957,12 @@
// create repository
logger.info("create repository " + repository.name);
r = JGitUtils.createRepository(repositoriesFolder, repository.name);
+
+ // automatically index master branch if Lucene integration is enabled
+ if (luceneExecutor.isReady()) {
+ repository.indexedBranches = new ArrayList<String>();
+ repository.indexedBranches.add("refs/heads/master");
+ }
} else {
// rename repository
if (!repositoryName.equalsIgnoreCase(repository.name)) {
@@ -1062,6 +1070,9 @@
}
if (!ArrayUtils.isEmpty(repository.mailingLists)) {
config.setStringList("gitblit", null, "mailingList", repository.mailingLists);
+ }
+ if (!ArrayUtils.isEmpty(repository.indexedBranches)) {
+ config.setStringList("gitblit", null, "indexBranch", repository.indexedBranches);
}
try {
config.save();
@@ -1656,12 +1667,13 @@
* Search the specified repositories using the Lucene query.
*
* @param query
- * @param maximumHits
+ * @param page
+ * @param pageSize
* @param repositories
* @return
*/
- public List<SearchResult> search(String query, int maximumHits, List<String> repositories) {
- List<SearchResult> srs = luceneExecutor.search(query, maximumHits, repositories);
+ public List<SearchResult> search(String query, int page, int pageSize, List<String> repositories) {
+ List<SearchResult> srs = luceneExecutor.search(query, page, pageSize, repositories);
return srs;
}
--
Gitblit v1.9.1