Permalink
Browse files

Merge branch 'master' of github.com:laravel/laravel

  • Loading branch information...
taylorotwell committed Jan 3, 2018
2 parents 60de3a5 + 73cff16 commit f4cba4f2b254456645036139129142df274a1ec1
Showing with 7 additions and 3 deletions.
  1. +1 −0 .env.example
  2. +2 −1 config/broadcasting.php
  3. +1 −1 database/factories/UserFactory.php
  4. +3 −1 resources/assets/js/bootstrap.js
View
@@ -32,3 +32,4 @@ MAIL_ENCRYPTION=null
PUSHER_APP_ID=
PUSHER_APP_KEY=
PUSHER_APP_SECRET=
PUSHER_APP_CLUSTER=mt1
View
@@ -36,7 +36,8 @@
'secret' => env('PUSHER_APP_SECRET'),
'app_id' => env('PUSHER_APP_ID'),
'options' => [
//
'cluster' => env('PUSHER_APP_CLUSTER'),
'encrypted' => true,
],
],
@@ -17,7 +17,7 @@
return [
'name' => $faker->name,
'email' => $faker->unique()->safeEmail,
'password' => '$2y$10$TKh8H1.PfQx37YgCzwiKb.KjNyWgaHb9cbcoQgdIVFlYg7B77UdFm',
'password' => '$2y$10$TKh8H1.PfQx37YgCzwiKb.KjNyWgaHb9cbcoQgdIVFlYg7B77UdFm', // secret
'remember_token' => str_random(10),
];
});
@@ -49,5 +49,7 @@ if (token) {
// window.Echo = new Echo({
// broadcaster: 'pusher',
// key: 'your-pusher-key'
// key: 'your-pusher-key',
// cluster: 'mt1',
// encrypted: true
// });

0 comments on commit f4cba4f

Please sign in to comment.