From 39ba051a78c30c1829dd560c4e726a832bb8aab3 Mon Sep 17 00:00:00 2001 From: Joseph Silber Date: Tue, 29 Mar 2016 21:48:12 -0400 Subject: [PATCH 1/7] Add support for the authorize middleware and AuthorizesRequests trait --- app/Http/Controllers/Controller.php | 3 ++- app/Http/Kernel.php | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 03e02a23..d492e0b3 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -6,8 +6,9 @@ use Illuminate\Foundation\Bus\DispatchesJobs; use Illuminate\Routing\Controller as BaseController; use Illuminate\Foundation\Validation\ValidatesRequests; use Illuminate\Foundation\Auth\Access\AuthorizesRequests; +use Illuminate\Foundation\Auth\Access\AuthorizesResources; class Controller extends BaseController { - use AuthorizesRequests, DispatchesJobs, ValidatesRequests; + use AuthorizesRequests, AuthorizesResources, DispatchesJobs, ValidatesRequests; } diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index f0d8083c..222a0572 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -46,6 +46,7 @@ class Kernel extends HttpKernel protected $routeMiddleware = [ 'auth' => \App\Http\Middleware\Authenticate::class, 'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class, + 'can' => \Illuminate\Foundation\Auth\Access\Middleware\Authorize::class, 'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class, 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, ]; From 28ea52d10b69b5cdf6fe72fe2acb5594022e1a8e Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Wed, 30 Mar 2016 19:52:07 +0100 Subject: [PATCH 2/7] Fixed up the phpunit config --- phpunit.xml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/phpunit.xml b/phpunit.xml index cc0841c1..3e884d17 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -10,12 +10,15 @@ stopOnFailure="false"> - ./tests/ + ./tests - - app/ + + ./app + + ./app/Http/routes.php + From ae1f39230942a5d32758cbb886441a31de4b2fa5 Mon Sep 17 00:00:00 2001 From: Jeffrey Way Date: Wed, 30 Mar 2016 16:17:01 -0400 Subject: [PATCH 3/7] Bump package versions --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 460ee907..b8363c2f 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,10 @@ { "private": true, "devDependencies": { - "gulp": "^3.8.8" + "gulp": "^3.9.1" }, "dependencies": { - "laravel-elixir": "^4.0.0", + "laravel-elixir": "^5.0.0", "bootstrap-sass": "^3.0.0" } } From 541e66789b47172aea60311a85c34669922784be Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Fri, 1 Apr 2016 20:27:17 +0100 Subject: [PATCH 4/7] Fixed typo --- app/Http/Kernel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 222a0572..ab3e3ef0 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -46,7 +46,7 @@ class Kernel extends HttpKernel protected $routeMiddleware = [ 'auth' => \App\Http\Middleware\Authenticate::class, 'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class, - 'can' => \Illuminate\Foundation\Auth\Access\Middleware\Authorize::class, + 'can' => \Illuminate\Foundation\Http\Middleware::class, 'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class, 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, ]; From 0d8e71cd9296fc1a6186c514d2114c4ac94289f6 Mon Sep 17 00:00:00 2001 From: Juan Martinez Date: Fri, 1 Apr 2016 16:00:36 -0500 Subject: [PATCH 5/7] Update Kernel.php --- app/Http/Kernel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index ab3e3ef0..bffcfd9f 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -46,7 +46,7 @@ class Kernel extends HttpKernel protected $routeMiddleware = [ 'auth' => \App\Http\Middleware\Authenticate::class, 'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class, - 'can' => \Illuminate\Foundation\Http\Middleware::class, + 'can' => \Illuminate\Foundation\Http\Middleware\Authorize::class, 'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class, 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, ]; From ce25be19ebfa73b53972518de629632931e77af7 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Tue, 5 Apr 2016 11:15:06 +0100 Subject: [PATCH 6/7] Tweaked config --- config/queue.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config/queue.php b/config/queue.php index a2f3888c..d0f732a6 100644 --- a/config/queue.php +++ b/config/queue.php @@ -11,8 +11,7 @@ return [ | API, giving you convenient access to each back-end using the same | syntax for each one. Here you may set the default queue driver. | - | Supported: "null", "sync", "database", "beanstalkd", - | "sqs", "redis" + | Supported: "null", "sync", "database", "beanstalkd", "sqs", "redis" | */ From cf1c1487784655d293dcd6856ae6ae7b426ea322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Till=20Kr=C3=BCss?= Date: Fri, 22 Apr 2016 19:39:28 -0700 Subject: [PATCH 7/7] Switch to `.scss` --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 95883dea..a8763f8e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,3 @@ * text=auto *.css linguist-vendored -*.less linguist-vendored +*.scss linguist-vendored