Merge remote-tracking branch 'origin/master'

This commit is contained in:
Taylor Otwell
2016-02-22 22:19:36 -06:00
11 changed files with 11 additions and 5 deletions

View File

@@ -1,6 +1,7 @@
APP_ENV=local APP_ENV=local
APP_DEBUG=true APP_DEBUG=true
APP_KEY=SomeRandomString APP_KEY=SomeRandomString
APP_URL=http://localhost
DB_HOST=127.0.0.1 DB_HOST=127.0.0.1
DB_DATABASE=homestead DB_DATABASE=homestead

View File

@@ -0,0 +1 @@

View File

@@ -0,0 +1 @@

View File

@@ -39,7 +39,7 @@ return [
| |
*/ */
'url' => 'http://localhost', 'url' => env('APP_URL', 'http://localhost'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

View File

@@ -14,7 +14,7 @@
$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,
'email' => $faker->email, 'email' => $faker->safeEmail,
'password' => bcrypt(str_random(10)), 'password' => bcrypt(str_random(10)),
'remember_token' => str_random(10), 'remember_token' => str_random(10),
]; ];

View File

@@ -0,0 +1 @@

View File

@@ -0,0 +1 @@

View File

@@ -11,6 +11,6 @@ class DatabaseSeeder extends Seeder
*/ */
public function run() public function run()
{ {
// $this->call(UserTableSeeder::class); // $this->call(UsersTableSeeder::class);
} }
} }

View File

@@ -24,4 +24,4 @@ If you discover a security vulnerability within Laravel, please send an e-mail t
## License ## License
The Laravel framework is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT) The Laravel framework is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT).

View File

@@ -0,0 +1 @@