From c0363f626c1193aa5e1263dbb272784eeba2e554 Mon Sep 17 00:00:00 2001 From: Igor Finagin Date: Tue, 22 Jun 2021 16:17:05 +0300 Subject: [PATCH 1/6] Fix editorconfig for laravel/sail's docker-compose (#5632) https://github.com/laravel/sail/pull/165#issuecomment-865190799 --- .editorconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.editorconfig b/.editorconfig index 6537ca46..1671c9b9 100644 --- a/.editorconfig +++ b/.editorconfig @@ -13,3 +13,6 @@ trim_trailing_whitespace = false [*.{yml,yaml}] indent_size = 2 + +[docker-compose.yml] +indent_size = 4 From c5f6f6187c24e160309df372b98d20380b786784 Mon Sep 17 00:00:00 2001 From: Josh Salway Date: Thu, 1 Jul 2021 23:37:19 +1000 Subject: [PATCH 2/6] Update validation.php (#5637) --- resources/lang/en/validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 7a15f437..e4586e53 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -117,7 +117,7 @@ return [ ], 'starts_with' => 'The :attribute must start with one of the following: :values.', 'string' => 'The :attribute must be a string.', - 'timezone' => 'The :attribute must be a valid zone.', + 'timezone' => 'The :attribute must be a valid timezone.', 'unique' => 'The :attribute has already been taken.', 'uploaded' => 'The :attribute failed to upload.', 'url' => 'The :attribute format is invalid.', From 866589128430c55385cb13ddae0061c628245be2 Mon Sep 17 00:00:00 2001 From: Josh Salway Date: Thu, 1 Jul 2021 23:38:06 +1000 Subject: [PATCH 3/6] Update validation.php (#5636) --- resources/lang/en/validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index e4586e53..6100f808 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -120,7 +120,7 @@ return [ 'timezone' => 'The :attribute must be a valid timezone.', 'unique' => 'The :attribute has already been taken.', 'uploaded' => 'The :attribute failed to upload.', - 'url' => 'The :attribute format is invalid.', + 'url' => 'The :attribute must be a valid URL.', 'uuid' => 'The :attribute must be a valid UUID.', /* From 1e4312f20755302bb4d275d9385968e9b6e63eab Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 6 Jul 2021 18:47:19 +0200 Subject: [PATCH 4/6] Update CHANGELOG.md --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3efa307..472b2a18 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ # Release Notes -## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.20...8.x) +## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.21...8.x) + + +## [v8.5.21 (2021-07-06)](https://github.com/laravel/laravel/compare/v8.5.20...v8.5.21) + +### Changed +- Update validation language files ([#5637](https://github.com/laravel/laravel/pull/5637), [#5636](https://github.com/laravel/laravel/pull/5636)) ## [v8.5.20 (2021-06-15)](https://github.com/laravel/laravel/compare/v8.5.19...v8.5.20) From c636fd0f678008caf30683833b740fb6f31d9de6 Mon Sep 17 00:00:00 2001 From: Claas Augner Date: Sat, 10 Jul 2021 17:23:22 +0200 Subject: [PATCH 5/6] add RateLimiter facade alias (#5642) --- config/app.php | 1 + 1 file changed, 1 insertion(+) diff --git a/config/app.php b/config/app.php index f572b646..c9b8f5ae 100644 --- a/config/app.php +++ b/config/app.php @@ -215,6 +215,7 @@ return [ 'Notification' => Illuminate\Support\Facades\Notification::class, 'Password' => Illuminate\Support\Facades\Password::class, 'Queue' => Illuminate\Support\Facades\Queue::class, + 'RateLimiter' => Illuminate\Support\Facades\RateLimiter::class, 'Redirect' => Illuminate\Support\Facades\Redirect::class, // 'Redis' => Illuminate\Support\Facades\Redis::class, 'Request' => Illuminate\Support\Facades\Request::class, From 8e5510458e1a4c0bf4b78024d9b0cf56102c8207 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 13 Jul 2021 16:12:18 +0200 Subject: [PATCH 6/6] Update CHANGELOG.md --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 472b2a18..3e01e78e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ # Release Notes -## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.21...8.x) +## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.22...8.x) + + +## [v8.5.22 (2021-07-13)](https://github.com/laravel/laravel/compare/v8.5.21...v8.5.22) + +### Changed +- Add RateLimiter facade alias ([#5642](https://github.com/laravel/laravel/pull/5642)) ## [v8.5.21 (2021-07-06)](https://github.com/laravel/laravel/compare/v8.5.20...v8.5.21)