diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2013-04-14 11:39:31 +0200 |
|---|---|---|
| committer | David Ostrovsky <david@ostrovsky.org> | 2013-04-14 11:39:31 +0200 |
| commit | 94793ed10acf996a4b3f9f1a8538a1b997436d9f (patch) | |
| tree | 371df7db0cdadf4645793e6b3cfb72e4053ee061 | |
| parent | 2df02e9abdcd13dc7081ef64fae4badbdd38044f (diff) | |
| parent | bffa6449bf97a32d3633031f4accc6915d5e0c0d (diff) | |
| download | gitblit-94793ed10acf996a4b3f9f1a8538a1b997436d9f.tar.gz gitblit-94793ed10acf996a4b3f9f1a8538a1b997436d9f.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
releases.moxie
| -rw-r--r-- | build.xml | 9 | ||||
| -rw-r--r-- | releases.moxie | 2 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/JsonServlet.java | 1 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/utils/JsonUtils.java | 1 |
4 files changed, 9 insertions, 4 deletions
@@ -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 59f3ba2e..78d533f2 100644 --- a/releases.moxie +++ b/releases.moxie @@ -11,6 +11,7 @@ r17: { - 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 @@ r17: { - 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 3ad2b7d2..3ee4a272 100644 --- a/src/main/java/com/gitblit/JsonServlet.java +++ b/src/main/java/com/gitblit/JsonServlet.java @@ -123,6 +123,7 @@ public abstract class JsonServlet extends HttpServlet { // 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 24f4ecb8..e9241827 100644 --- a/src/main/java/com/gitblit/utils/JsonUtils.java +++ b/src/main/java/com/gitblit/utils/JsonUtils.java @@ -268,7 +268,6 @@ public class JsonUtils { 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);
}
|