From 94793ed10acf996a4b3f9f1a8538a1b997436d9f Mon Sep 17 00:00:00 2001
From: David Ostrovsky <david@ostrovsky.org>
Date: Sun, 14 Apr 2013 05:39:31 -0400
Subject: [PATCH] Merge remote-tracking branch 'upstream/master'
---
src/main/java/com/gitblit/JsonServlet.java | 1 +
src/main/java/com/gitblit/utils/JsonUtils.java | 1 -
releases.moxie | 2 ++
build.xml | 9 ++++++---
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/build.xml b/build.xml
index a0a29fb..309becf 100644
--- a/build.xml
+++ b/build.xml
@@ -4,10 +4,12 @@
<!--
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Retrieve Moxie Toolkit
+
+ documentation @ http://gitblit.github.io/moxie
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-->
- <property name="moxie.version" value="0.7.1" />
- <property name="moxie.url" value="http://gitblit.github.com/moxie/maven" />
+ <property name="moxie.version" value="0.7.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" />
@@ -992,7 +994,8 @@
<target name="installMaven" depends="compile" description="Install Gitblit JAR as Maven module">
<local name="project.jar" />
<property name="project.jar" value="${project.outputDirectory}/gitblit.jar" />
- <mx:jar destfile="${project.jar}" includeresources="true" />
+ <property name="resourceFolderPrefix" value="" />
+ <mx:jar destfile="${project.jar}" includeresources="true" resourceFolderPrefix="${resourceFolderPrefix}" />
<exec executable="mvn">
<arg value="install:install-file" />
diff --git a/releases.moxie b/releases.moxie
index 59f3ba2..78d533f 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -11,6 +11,7 @@
- Could not reset settings with $ or { characters through Gitblit Manager because they are not properly escaped
- Added more error checking to blob page and blame page
- Disable SNI extensions for client SSL connections
+ - Use bash instead of sh in Linux/OSX shell scripts (issue 154)
- Fix NPE when getting user's fork without repository list caching (issue 182)
- Fix internal error on folder history links (issue 192)
- Fixed incorrect icon file name for .doc files (issue 200)
@@ -56,6 +57,7 @@
- Philip Boutros
- Rafael Cavazin
- Ryan Schneider
+ - Sakurai Youhei
- Sarah Haselbauer
- Slawomir Bochenski
- Stardrad Yin
diff --git a/src/main/java/com/gitblit/JsonServlet.java b/src/main/java/com/gitblit/JsonServlet.java
index 3ad2b7d..3ee4a27 100644
--- a/src/main/java/com/gitblit/JsonServlet.java
+++ b/src/main/java/com/gitblit/JsonServlet.java
@@ -123,6 +123,7 @@
// Send JSON response
String json = JsonUtils.toJsonString(o);
response.setCharacterEncoding(Constants.ENCODING);
+ response.setContentType("application/json");
response.getWriter().append(json);
}
}
diff --git a/src/main/java/com/gitblit/utils/JsonUtils.java b/src/main/java/com/gitblit/utils/JsonUtils.java
index 24f4ecb..e924182 100644
--- a/src/main/java/com/gitblit/utils/JsonUtils.java
+++ b/src/main/java/com/gitblit/utils/JsonUtils.java
@@ -268,7 +268,6 @@
GsonBuilder builder = new GsonBuilder();
builder.registerTypeAdapter(Date.class, new GmtDateTypeAdapter());
builder.registerTypeAdapter(AccessPermission.class, new AccessPermissionTypeAdapter());
- builder.setPrettyPrinting();
if (!ArrayUtils.isEmpty(strategies)) {
builder.setExclusionStrategies(strategies);
}
--
Gitblit v1.9.1