Merge remote-tracking branch 'origin/staging' into staging

This commit is contained in:
benmcmahon100
2015-08-03 16:43:44 +01:00

View File

@ -186,11 +186,6 @@ passportConfigurator.init();
app.use(rxMiddleware()); app.use(rxMiddleware());
app.use(function(req, res, next) { app.use(function(req, res, next) {
// add beta warning
req.flash('info', {
msg: `warning: you are on experimental branch of Free Code Camp:
Your progress here may or may not be saved to the main site`
});
// Make user object available in templates. // Make user object available in templates.
res.locals.user = req.user; res.locals.user = req.user;