diff options
| author | James Moger <james.moger@gitblit.com> | 2014-10-26 10:20:43 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-10-26 10:20:43 -0400 |
| commit | 3faf6f6469759538590aa7f1012c543f95583c56 (patch) | |
| tree | ab730016d0bbf881dcd03914141116f9111429bf | |
| parent | 0c083063b5dbf949533a986262368b796c867910 (diff) | |
| parent | 9ceddb66153d78fbbc13fc6b1ab24714080ed17a (diff) | |
| download | gitblit-3faf6f6469759538590aa7f1012c543f95583c56.tar.gz gitblit-3faf6f6469759538590aa7f1012c543f95583c56.zip | |
Merge branch 'ticket/211' into develop
| -rw-r--r-- | releases.moxie | 30 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/servlet/RawServlet.java | 5 |
2 files changed, 28 insertions, 7 deletions
diff --git a/releases.moxie b/releases.moxie index 94427b10..6523cebc 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} @@ -33,6 +33,28 @@ r26: { } # +# 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 # r25: { @@ -1566,6 +1588,6 @@ r1: { - 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 8f30bfbe..682e555a 100644 --- a/src/main/java/com/gitblit/servlet/RawServlet.java +++ b/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) { |