Bring in upstream changed from github.com/laravel/laravel
Squashed commit of the following: commit e6e0ea2e6e0db9637ae67dfa913ec42f7f08b81e Author: Jonny Barnes <jonny@jonnybarnes.uk> Date: Wed Oct 19 21:49:59 2016 +0100 Remove needless .gitkeep files commit 1c7704b2913c689c6cad0eb934787e9fedf0f4fa Author: Jonny Barnes <jonny@jonnybarnes.uk> Date: Wed Oct 19 21:48:47 2016 +0100 Use fullpath import for the validator facade commit dbc28853b6712ba040394cf9943a1a8de85bf44c Author: Jonny Barnes <jonny@jonnybarnes.uk> Date: Wed Oct 19 21:46:07 2016 +0100 Add redirectTo attribute to the reset password controller commit 0555680e24c0175acce0be66a2f332c5fa4b35a1 Author: Jonny Barnes <jonny@jonnybarnes.uk> Date: Wed Oct 19 21:44:00 2016 +0100 Ignore Passport-generated OAuth keys commit 1be872180c52bc267cd43f3a7b8e2b49b4c6f023 Author: Jonny Barnes <jonny@jonnybarnes.uk> Date: Wed Oct 19 21:41:42 2016 +0100 Fixing typehint commit d72b783f8511898fe13fbb99fa5739a846801db9 Author: Jonny Barnes <jonny@jonnybarnes.uk> Date: Wed Oct 19 21:40:35 2016 +0100 fix spacing commit 4870a56fbe273a37ce67203c0e0aed857dccbb1f Author: Jonny Barnes <jonny@jonnybarnes.uk> Date: Wed Oct 19 21:39:54 2016 +0100 Add typehint for factory
This commit is contained in:
parent
6b71ff74c1
commit
745d16c610
6 changed files with 10 additions and 3 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -9,3 +9,4 @@ Homestead.json
|
||||||
/public/files
|
/public/files
|
||||||
/public/keybase.txt
|
/public/keybase.txt
|
||||||
/coverage
|
/coverage
|
||||||
|
/storage/*.key
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -20,6 +20,13 @@ class ResetPasswordController extends Controller
|
||||||
|
|
||||||
use ResetsPasswords;
|
use ResetsPasswords;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Where to redirect users after resetting their password.
|
||||||
|
*
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
protected $redirectTo = '/home';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new controller instance.
|
* Create a new controller instance.
|
||||||
*
|
*
|
||||||
|
|
|
@ -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) {
|
||||||
return [
|
return [
|
||||||
'name' => $faker->name,
|
'name' => $faker->name,
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
|
|
Loading…
Add table
Reference in a new issue