mirror of
https://github.com/laravel/laravel.git
synced 2025-02-20 11:53:14 +08:00
Merge branch '8.x'
# Conflicts: # CHANGELOG.md # tests/Feature/ExampleTest.php # tests/Unit/ExampleTest.php
This commit is contained in:
commit
dd8111a32d
12
CHANGELOG.md
12
CHANGELOG.md
@ -1,6 +1,16 @@
|
||||
# Release Notes
|
||||
|
||||
## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.15...master)
|
||||
## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.16...master)
|
||||
|
||||
|
||||
## [v8.5.16 (2021-04-20)](https://github.com/laravel/laravel/compare/v8.5.15...v8.5.16)
|
||||
|
||||
### Changed
|
||||
- Rename test methods ([#5574](https://github.com/laravel/laravel/pull/5574))
|
||||
- Using faker method instead of properties ([#5583](https://github.com/laravel/laravel/pull/5583))
|
||||
|
||||
### Fixed
|
||||
- Ignore SQLite files generated on parallel testing ([#5593](https://github.com/laravel/laravel/pull/5593))
|
||||
|
||||
|
||||
## [v8.5.15 (2021-03-23)](https://github.com/laravel/laravel/compare/v8.5.14...v8.5.15)
|
||||
|
@ -42,7 +42,7 @@ We would like to extend our thanks to the following sponsors for funding Laravel
|
||||
- **[Many](https://www.many.co.uk)**
|
||||
- **[Webdock, Fast VPS Hosting](https://www.webdock.io/en)**
|
||||
- **[DevSquad](https://devsquad.com)**
|
||||
- **[Curotec](https://www.curotec.com/)**
|
||||
- **[Curotec](https://www.curotec.com/services/technologies/laravel/)**
|
||||
- **[OP.GG](https://op.gg)**
|
||||
|
||||
## Contributing
|
||||
|
3
database/.gitignore
vendored
3
database/.gitignore
vendored
@ -1,2 +1 @@
|
||||
*.sqlite
|
||||
*.sqlite-journal
|
||||
*.sqlite*
|
||||
|
@ -23,8 +23,8 @@ class UserFactory extends Factory
|
||||
public function definition()
|
||||
{
|
||||
return [
|
||||
'name' => $this->faker->name,
|
||||
'email' => $this->faker->unique()->safeEmail,
|
||||
'name' => $this->faker->name(),
|
||||
'email' => $this->faker->unique()->safeEmail(),
|
||||
'email_verified_at' => now(),
|
||||
'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password
|
||||
'remember_token' => Str::random(10),
|
||||
|
Loading…
x
Reference in New Issue
Block a user