From 8b158e67576cb53825dc543405db8e1710d0c04f Mon Sep 17 00:00:00 2001 From: greenkeeperio-bot Date: Wed, 27 Jul 2016 13:56:55 -0700 Subject: [PATCH 1/2] chore(package): update react-router-bootstrap to version 0.23.1 https://greenkeeper.io/ --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index edd53e0259..8c1f2813e7 100644 --- a/package.json +++ b/package.json @@ -114,7 +114,7 @@ "react-pure-render": "^1.0.2", "react-redux": "^4.0.6", "react-router": "^2.0.0", - "react-router-bootstrap": "~0.20.1", + "react-router-bootstrap": "~0.23.1", "react-router-redux": "^2.1.0", "react-toastr": "^2.4.0", "react-youtube": "^6.1.0", From 88557bfa4be92b7f966d3025473f28bda1d9cb70 Mon Sep 17 00:00:00 2001 From: alanbares Date: Thu, 28 Jul 2016 15:31:17 -0700 Subject: [PATCH 2/2] Redirect old wiki urls to root of forum Remove extra callback --- server/boot/t-wiki.js | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/server/boot/t-wiki.js b/server/boot/t-wiki.js index d19b6b1ccd..af8f3020c3 100644 --- a/server/boot/t-wiki.js +++ b/server/boot/t-wiki.js @@ -1,17 +1,12 @@ module.exports = function(app) { var router = app.loopback.Router(); - router.get('/wiki/*', showWiki); - router.get('/wiki', (req, res) => res.redirect(301, '/wiki/en/')); + router.get('/wiki/*', showForum); app.use(router); - function showWiki(req, res) { - res.render( - 'wiki/show', - { - title: 'Wiki | Free Code Camp', - path: req.path.replace(/^\/wiki/, '') - } + function showForum(req, res) { + res.redirect( + 'http://forum.freecodecamp.com/' ); } };