Pull in upstream laravel updates

This commit is contained in:
Kevin MacMartin 2016-10-26 11:05:43 -04:00
parent df7676ece8
commit 9089ae21ac
10 changed files with 17 additions and 10 deletions

3
.gitignore vendored
View file

@ -7,7 +7,6 @@
/public/fonts /public/fonts
/public/uploads /public/uploads
/storage/exports /storage/exports
/storage.*.key
/.idea /.idea
.env .env
Homestead.yaml
Homestead.json

View file

@ -1 +1 @@
f4606d2bb94dc9579488df61fa3744b17e91be62 6a2bf4476528a359e9b80a296f26830f75770d35

View file

@ -3,8 +3,8 @@
namespace App\Http\Controllers\Auth; namespace App\Http\Controllers\Auth;
use App\User; use App\User;
use Validator;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Validator;
use Illuminate\Foundation\Auth\RegistersUsers; use Illuminate\Foundation\Auth\RegistersUsers;
class RegisterController extends Controller class RegisterController extends Controller

View file

@ -20,6 +20,13 @@ class ResetPasswordController extends Controller
use ResetsPasswords; use ResetsPasswords;
/**
* Where to redirect users after resetting their password.
*
* @var string
*/
protected $redirectTo = '/';
/** /**
* Create a new controller instance. * Create a new controller instance.
* *

View file

@ -8,10 +8,8 @@ return [
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| Here you may specify the default filesystem disk that should be used | Here you may specify the default filesystem disk that should be used
| by the framework. A "local" driver, as well as a variety of cloud | by the framework. The "local" disk, as well as a variety of cloud
| based drivers are available for your choosing. Just store away! | based disks are available to your application. Just store away!
|
| Supported: "local", "ftp", "s3", "rackspace"
| |
*/ */
@ -39,6 +37,8 @@ return [
| may even configure multiple disks of the same driver. Defaults have | may even configure multiple disks of the same driver. Defaults have
| been setup for each driver as an example of the required options. | been setup for each driver as an example of the required options.
| |
| Supported Drivers: "local", "ftp", "s3", "rackspace"
|
*/ */
'disks' => [ 'disks' => [

View file

@ -11,6 +11,7 @@
| |
*/ */
/** @var \Illuminate\Database\Eloquent\Factory $factory */
$factory->define(App\User::class, function (Faker\Generator $faker) { $factory->define(App\User::class, function (Faker\Generator $faker) {
static $password; static $password;

View file

@ -30,6 +30,6 @@ class CreateUsersTable extends Migration
*/ */
public function down() public function down()
{ {
Schema::drop('users'); Schema::dropIfExists('users');
} }
} }

View file

@ -27,6 +27,6 @@ class CreatePasswordResetsTable extends Migration
*/ */
public function down() public function down()
{ {
Schema::drop('password_resets'); Schema::dropIfExists('password_resets');
} }
} }