Merge branch '8.x'

# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Dries Vints 2021-02-16 17:59:48 +01:00
commit 828f2d4401
No known key found for this signature in database
GPG Key ID: E1529B3ACC4A5A76
5 changed files with 29 additions and 4 deletions

View File

@ -1,6 +1,17 @@
# Release Notes # Release Notes
## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.9...master) ## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.10...master)
## [v8.5.10 (2021-02-16)](https://github.com/laravel/laravel/compare/v8.5.9...v8.5.10)
### Changed
- Add "ably" in comment as a broadcast connection ([#5531](https://github.com/laravel/laravel/pull/5531))
- Add unverified state to UserFactory ([#5533](https://github.com/laravel/laravel/pull/5533))
- Update login wording ([9a56a60](https://github.com/laravel/laravel/commit/9a56a60cc9e3785683e256d511ee1fb533025a0a))
### Fixed
- Fix dead link in web.config ([#5528](https://github.com/laravel/laravel/pull/5528))
## [v8.5.9 (2021-01-19)](https://github.com/laravel/laravel/compare/v8.5.8...v8.5.9) ## [v8.5.9 (2021-01-19)](https://github.com/laravel/laravel/compare/v8.5.8...v8.5.9)

View File

@ -11,7 +11,7 @@
| framework when an event needs to be broadcast. You may set this to | framework when an event needs to be broadcast. You may set this to
| any of the connections defined in the "connections" array below. | any of the connections defined in the "connections" array below.
| |
| Supported: "pusher", "redis", "log", "null" | Supported: "pusher", "ably", "redis", "log", "null"
| |
*/ */

View File

@ -30,4 +30,18 @@ public function definition()
'remember_token' => Str::random(10), 'remember_token' => Str::random(10),
]; ];
} }
/**
* Define the model's unverified state.
*
* @return \Illuminate\Database\Eloquent\Factories\Factory
*/
public function unverified()
{
return $this->state(function (array $attributes) {
return [
'email_verified_at' => null,
];
});
}
} }

View File

@ -1,6 +1,6 @@
<!-- <!--
Rewrites requires Microsoft URL Rewrite Module for IIS Rewrites requires Microsoft URL Rewrite Module for IIS
Download: https://www.microsoft.com/en-us/download/details.aspx?id=47337 Download: https://www.iis.net/downloads/microsoft/url-rewrite
Debug Help: https://docs.microsoft.com/en-us/iis/extensions/url-rewrite-module/using-failed-request-tracing-to-trace-rewrite-rules Debug Help: https://docs.microsoft.com/en-us/iis/extensions/url-rewrite-module/using-failed-request-tracing-to-trace-rewrite-rules
--> -->
<configuration> <configuration>

View File

@ -27,7 +27,7 @@
@auth @auth
<a href="{{ url('/home') }}" class="text-sm text-gray-700 underline">Home</a> <a href="{{ url('/home') }}" class="text-sm text-gray-700 underline">Home</a>
@else @else
<a href="{{ route('login') }}" class="text-sm text-gray-700 underline">Login</a> <a href="{{ route('login') }}" class="text-sm text-gray-700 underline">Log in</a>
@if (Route::has('register')) @if (Route::has('register'))
<a href="{{ route('register') }}" class="ml-4 text-sm text-gray-700 underline">Register</a> <a href="{{ route('register') }}" class="ml-4 text-sm text-gray-700 underline">Register</a>