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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e086a32..37346868 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,18 @@ # Release Notes -## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.20...master) +## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.22...master) + + +## [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) + +### 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) 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, diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 7a15f437..6100f808 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -117,10 +117,10 @@ 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.', + 'url' => 'The :attribute must be a valid URL.', 'uuid' => 'The :attribute must be a valid UUID.', /*