Browse Source

Merge remote-tracking branch 'origin/master'

Taylor Otwell 8 years ago
parent
commit
754d78ec8e

+ 1 - 0
.env.example

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

+ 1 - 0
app/Listeners/.gitkeep

@@ -0,0 +1 @@
+

+ 1 - 0
app/Policies/.gitkeep

@@ -0,0 +1 @@
+

+ 1 - 1
config/app.php

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

+ 1 - 1
database/factories/ModelFactory.php

@@ -14,7 +14,7 @@
 $factory->define(App\User::class, function (Faker\Generator $faker) {
     return [
         'name' => $faker->name,
-        'email' => $faker->email,
+        'email' => $faker->safeEmail,
         'password' => bcrypt(str_random(10)),
         'remember_token' => str_random(10),
     ];

+ 1 - 0
database/migrations/.gitkeep

@@ -0,0 +1 @@
+

+ 1 - 0
database/seeds/.gitkeep

@@ -0,0 +1 @@
+

+ 1 - 1
database/seeds/DatabaseSeeder.php

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

+ 1 - 1
readme.md

@@ -24,4 +24,4 @@ If you discover a security vulnerability within Laravel, please send an e-mail t
 
 ## 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).

+ 1 - 0
resources/views/vendor/.gitkeep

@@ -0,0 +1 @@
+

+ 1 - 1
storage/framework/cache/.gitignore

@@ -1,2 +1,2 @@
 *
-!.gitignore
+!.gitignore