summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/gitblit
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2015-09-28 10:25:59 -0400
committerJames Moger <james.moger@gitblit.com>2015-09-28 10:25:59 -0400
commitc0d028b5fe76592f55c622c6e24cbe91de49a261 (patch)
tree11112b59e1c5082e97d2d71a709c9eecef616f58 /src/main/java/com/gitblit
parent03223516b32758fe9d5602ffb4ce10a8a308f0e9 (diff)
downloadgitblit-c0d028b5fe76592f55c622c6e24cbe91de49a261.tar.gz
gitblit-c0d028b5fe76592f55c622c6e24cbe91de49a261.zip
Fixes #922: RSS feed link ignores forward-slash character
Diffstat (limited to 'src/main/java/com/gitblit')
-rw-r--r--src/main/java/com/gitblit/servlet/SyndicationServlet.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/com/gitblit/servlet/SyndicationServlet.java b/src/main/java/com/gitblit/servlet/SyndicationServlet.java
index c6343d9f..39dbf2e5 100644
--- a/src/main/java/com/gitblit/servlet/SyndicationServlet.java
+++ b/src/main/java/com/gitblit/servlet/SyndicationServlet.java
@@ -22,8 +22,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
import javax.servlet.http.HttpServlet;
import org.eclipse.jgit.lib.ObjectId;
@@ -48,6 +46,8 @@ import com.gitblit.utils.HttpUtils;
import com.gitblit.utils.JGitUtils;
import com.gitblit.utils.StringUtils;
import com.gitblit.utils.SyndicationUtils;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
/**
* SyndicationServlet generates RSS 2.0 feeds and feed links.
@@ -368,7 +368,7 @@ public class SyndicationServlet extends HttpServlet {
if (mountParameters) {
// mounted url
feedLink = MessageFormat.format("{0}/summary/{1}", gitblitUrl,
- StringUtils.encodeURL(feedName));
+ StringUtils.encodeURL(feedName.replace('/', fsc)));
} else {
// parameterized url
feedLink = MessageFormat.format("{0}/summary/?r={1}", gitblitUrl,