From 3faf6f6469759538590aa7f1012c543f95583c56 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 26 Oct 2014 10:20:43 -0400
Subject: [PATCH] Merge branch 'ticket/211' into develop
---
src/main/java/com/gitblit/servlet/RawServlet.java | 5 ++---
releases.moxie | 30 ++++++++++++++++++++++++++----
2 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/releases.moxie b/releases.moxie
index 94427b1..6523ceb 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -1,7 +1,7 @@
#
# ${project.version} release
#
-r26: {
+r27: {
title: ${project.name} ${project.version} released
id: ${project.version}
date: ${project.buildDate}
@@ -30,6 +30,28 @@
- Alex Lewis
- Florian Zschocke
- Paul Martin
+}
+
+#
+# 1.6.2 release
+#
+r26: {
+ title: Gitblit 1.6.2 released
+ id: 1.6.2
+ date: ${project.buildDate}
+ note: ~
+ html: ~
+ text: ~
+ security: ~
+ fixes:
+ - Fix French translation (pr-224, ticket-210)
+ - Fix raw servlet trashing paths with spaces (ticket-211)
+ changes: ~
+ additions: ~
+ dependencyChanges: ~
+ contributors:
+ - Pierre Templier
+ - Barry Roberts
}
#
@@ -1566,6 +1588,6 @@
- James Moger
}
-snapshot: &r26
-release: &r25
-releases: &r[1..25]
+snapshot: &r27
+release: &r26
+releases: &r[1..26]
diff --git a/src/main/java/com/gitblit/servlet/RawServlet.java b/src/main/java/com/gitblit/servlet/RawServlet.java
index 8f30bfb..682e555 100644
--- a/src/main/java/com/gitblit/servlet/RawServlet.java
+++ b/src/main/java/com/gitblit/servlet/RawServlet.java
@@ -108,9 +108,8 @@
branch = Repository.shortenRefName(branch).replace('/', fsc);
}
- String encodedPath = path == null ? "" : path.replace(' ', '-');
- encodedPath = encodedPath.replace('/', fsc);
- return baseURL + Constants.RAW_PATH + repository + "/" + (branch == null ? "" : (branch + "/" + (path == null ? "" : encodedPath)));
+ String encodedPath = path == null ? "" : path.replace('/', fsc);
+ return baseURL + Constants.RAW_PATH + repository + "/" + (branch == null ? "" : (branch + "/" + encodedPath));
}
protected String getBranch(String repository, HttpServletRequest request) {
--
Gitblit v1.9.1