From 4235bdfbb380ebd0052358c23d79ed8c78e1a472 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 18 Apr 2017 17:04:44 +0300 Subject: [PATCH] Working on tests --- app/Http/Controllers/Auth/AuthController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index 96b735842d..0fb64d2d8f 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -120,8 +120,8 @@ class AuthController extends Controller if (! Utils::isNinja() && ! User::count()) { return redirect()->to('/setup'); } - /* - if (Utils::isNinja()) { + + if (Utils::isNinja() && ! Utils::isTravis()) { // make sure the user is on SITE_URL/login to ensure OAuth works $requestURL = request()->url(); $loginURL = SITE_URL . '/login'; @@ -130,7 +130,7 @@ class AuthController extends Controller return redirect()->to($loginURL); } } - */ + return self::getLogin(); }