Merge branch 'ticket/211' into develop

releases.moxie

@@ -1,7 +1,7 @@
 #
 # ${project.version} release
 #
-r26: {
+r27: {
     title: ${project.name} ${project.version} released
     id: ${project.version}
     date: ${project.buildDate}
@@ -32,6 +32,28 @@ r26: {
     - 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 
+}
+
 #
 # 1.6.1 release
 #
@@ -1566,6 +1588,6 @@ r1: {
 	- James Moger
 }
 
-snapshot: &r26
-release: &r25
-releases: &r[1..25]
+snapshot: &r27
+release: &r26
+releases: &r[1..26]

src/main/java/com/gitblit/servlet/RawServlet.java

@@ -108,9 +108,8 @@ public class RawServlet extends HttpServlet {
 			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) {