diff options
| -rw-r--r-- | build.moxie | 2 | ||||
| -rw-r--r-- | build.xml | 4 | ||||
| -rw-r--r-- | release.template | 2 | ||||
| -rw-r--r-- | releases.moxie | 20 | ||||
| -rw-r--r-- | src/main/distrib/data/gitblit.properties | 4 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/GitBlit.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/utils/JGitUtils.java | 2 |
7 files changed, 29 insertions, 7 deletions
diff --git a/build.moxie b/build.moxie index 78bc4a49..424a7d75 100644 --- a/build.moxie +++ b/build.moxie @@ -10,7 +10,7 @@ name: Gitblit description: pure Java Git solution groupId: com.gitblit artifactId: gitblit -version: 1.3.2 +version: 1.3.3-SNAPSHOT inceptionYear: 2011 # Current stable release @@ -8,7 +8,7 @@ documentation @ http://gitblit.github.io/moxie
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-->
- <property name="moxie.version" value="0.8.1" />
+ <property name="moxie.version" value="0.8.2" />
<property name="moxie.url" value="http://gitblit.github.io/moxie/maven" />
<property name="moxie.jar" value="moxie-toolkit-${moxie.version}.jar" />
<property name="moxie.dir" value="${user.home}/.moxie" />
@@ -1003,6 +1003,8 @@ <include name="sendmail-html.groovy" />
<include name="jenkins.groovy" />
<include name="protect-refs.groovy" />
+ <include name="blockpush.groovy" />
+ <include name="localclone.groovy" />
<include name="fogbugz.groovy" />
<include name="thebuggenie.groovy" />
</fileset>
diff --git a/release.template b/release.template index 2dd45c8b..f248efdb 100644 --- a/release.template +++ b/release.template @@ -28,7 +28,7 @@ echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" echo "Building ${project.version} RELEASE artifacts"
echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
echo ""
-ant clean buildAll
+ant clean buildAll buildMavenArtifacts
# commit all generated artifacts and metadata
echo ""
diff --git a/releases.moxie b/releases.moxie index 7145135a..901bd337 100644 --- a/releases.moxie +++ b/releases.moxie @@ -1,4 +1,22 @@ # +# ${project.version} release +# +r20: { + title: ${project.name} ${project.version} released + id: ${project.version} + date: ${project.buildDate} + note: ~ + html: ~ + text: ~ + security: ~ + fixes: ~ + changes: ~ + additions: ~ + dependencyChanges: ~ + contributors: ~ +} + +# # 1.3.2 release # r19: { @@ -975,6 +993,6 @@ r1: { - James Moger } -snapshot: ~ +snapshot: &r20 release: &r19 releases: &r[1..19] diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties index 0837cde9..7da65ffd 100644 --- a/src/main/distrib/data/gitblit.properties +++ b/src/main/distrib/data/gitblit.properties @@ -956,7 +956,7 @@ web.reflogChangesPerPage = 10 #
# SPACE-DELIMITED
# SINCE 0.9.0
-web.luceneIgnoreExtensions = 7z arc arj bin bmp dll doc docx exe gif gz jar jpg lib lzh odg odf odt pdf ppt png so swf xcf xls xlsx zip
+web.luceneIgnoreExtensions = 7z arc arj bin bmp dll doc docx exe gif gz jar jpg lib lzh odg odf odt pdf ppt pptx png so swf tar xcf xls xlsx zip
# Registered extensions for google-code-prettify
#
@@ -981,7 +981,7 @@ web.imageExtensions = bmp jpg gif png #
# SPACE-DELIMITED
# SINCE 0.5.0
-web.binaryExtensions = jar pdf tar.gz zip
+web.binaryExtensions = 7z arc arj bin dll doc docx exe gz jar lib lzh odg odf odt pdf ppt pptx so tar xls xlsx zip
# Aggressive heap management will run the garbage collector on every generated
# page. This slows down page generation a little but improves heap consumption.
diff --git a/src/main/java/com/gitblit/GitBlit.java b/src/main/java/com/gitblit/GitBlit.java index 9b79e3c9..2348f576 100644 --- a/src/main/java/com/gitblit/GitBlit.java +++ b/src/main/java/com/gitblit/GitBlit.java @@ -3607,7 +3607,7 @@ public class GitBlit implements ServletContextListener { Date cutoff = CommitCache.instance().getCutoffDate(); for (String repositoryName : getRepositoryList()) { RepositoryModel model = getRepositoryModel(repositoryName); - if (model.hasCommits && model.lastChange.after(cutoff)) { + if (model != null && model.hasCommits && model.lastChange.after(cutoff)) { repoCount++; Repository repository = getRepository(repositoryName); for (RefModel ref : JGitUtils.getLocalBranches(repository, true, -1)) { diff --git a/src/main/java/com/gitblit/utils/JGitUtils.java b/src/main/java/com/gitblit/utils/JGitUtils.java index 8676d748..3f01eeaf 100644 --- a/src/main/java/com/gitblit/utils/JGitUtils.java +++ b/src/main/java/com/gitblit/utils/JGitUtils.java @@ -566,6 +566,8 @@ public class JGitUtils { try {
if (tree == null) {
ObjectId object = getDefaultBranch(repository);
+ if (object == null)
+ return null;
RevCommit commit = rw.parseCommit(object);
tree = commit.getTree();
}
|