From 772ac42005cc62f355cf91d31a8034b91fb53b17 Mon Sep 17 00:00:00 2001 From: James Allen Date: Fri, 21 Sep 2018 10:42:20 +0100 Subject: [PATCH] Fix messed up rebase --- services/web/app/coffee/router.coffee | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/services/web/app/coffee/router.coffee b/services/web/app/coffee/router.coffee index 1bd445a8bc..ac0889d0c4 100644 --- a/services/web/app/coffee/router.coffee +++ b/services/web/app/coffee/router.coffee @@ -330,7 +330,6 @@ module.exports = class Router AuthenticationController.httpAuth, CompileController.getFileFromClsiWithoutUser -<<<<<<< HEAD webRouter.get '/teams', (req, res, next) -> # Match v1 behaviour - if the user is signed in, show their teams list # Otherwise show some information about teams @@ -338,14 +337,13 @@ module.exports = class Router res.redirect('/user/subscription') else res.redirect("#{settings.v1Api.host}/teams") -======= + webRouter.get '/chrome', (req, res, next) -> # Match v1 behaviour - this is used for a Chrome web app if AuthenticationController.isUserLoggedIn(req) res.redirect('/project') else res.redirect('/register') ->>>>>>> Add /chrome redirect to match v1 behaviour #Admin Stuff webRouter.get '/admin', AuthorizationMiddlewear.ensureUserIsSiteAdmin, AdminController.index