From f97e5510712e1fd1148c02cc435c97a281660fd1 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 12 Jan 2021 18:18:35 +0100 Subject: [PATCH 1/7] Update TrustProxies.php (#5514) --- app/Http/Middleware/TrustProxies.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php index 14befceb..a3b6aef9 100644 --- a/app/Http/Middleware/TrustProxies.php +++ b/app/Http/Middleware/TrustProxies.php @@ -19,5 +19,5 @@ class TrustProxies extends Middleware * * @var int */ - protected $headers = Request::HEADER_X_FORWARDED_ALL; + protected $headers = Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO | Request::HEADER_X_FORWARDED_AWS_ELB; } From cdd79ce5cf99be1963295c2d84da74e03afbeb95 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 12 Jan 2021 18:39:43 +0100 Subject: [PATCH 2/7] Update CHANGELOG.md --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a55a929..6eed5ab1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ # Release Notes -## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.7...8.x) +## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.8...8.x) + + +## [v8.5.8 (2021-01-12)](https://github.com/laravel/laravel/compare/v8.5.7...v8.5.8) + +### Fixed +- Update `TrustProxies.php` ([#5514](https://github.com/laravel/laravel/pull/5514)) ## [v8.5.7 (2021-01-05)](https://github.com/laravel/laravel/compare/v8.5.6...v8.5.7) From ea7de4f5a91c14c23bc038bc3a3ce65633f20701 Mon Sep 17 00:00:00 2001 From: Gemma Black Date: Tue, 12 Jan 2021 18:51:19 +0000 Subject: [PATCH 3/7] Hide .env.bak as well as .env.backup in .gitignore (#5515) --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0ae59f0b..3597c33e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,7 @@ /storage/*.key /vendor .env -.env.backup +.env.ba* .phpunit.result.cache docker-compose.override.yml Homestead.json From 5dd08043a3a5bb3eeca0f070f0e7cb309e06f2be Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 12 Jan 2021 14:02:00 -0600 Subject: [PATCH 4/7] wip --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3597c33e..0ae59f0b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,7 @@ /storage/*.key /vendor .env -.env.ba* +.env.backup .phpunit.result.cache docker-compose.override.yml Homestead.json From 21c0aed802a69838ba848d93228e725067a2e205 Mon Sep 17 00:00:00 2001 From: Kacper Ziubryniewicz Date: Thu, 14 Jan 2021 23:27:55 +0100 Subject: [PATCH 5/7] Add a missing dot in translations (#5520) --- 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 2e2820b0..c77e41ce 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -90,7 +90,7 @@ return [ 'string' => 'The :attribute must be at least :min characters.', 'array' => 'The :attribute must have at least :min items.', ], - 'multiple_of' => 'The :attribute must be a multiple of :value', + 'multiple_of' => 'The :attribute must be a multiple of :value.', 'not_in' => 'The selected :attribute is invalid.', 'not_regex' => 'The :attribute format is invalid.', 'numeric' => 'The :attribute must be a number.', From b580fc1ef2b286c2f9e156755431abe45a1e61c7 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Fri, 15 Jan 2021 17:24:56 +0100 Subject: [PATCH 6/7] Delete docker-compose.yml (#5522) --- docker-compose.yml | 74 ---------------------------------------------- 1 file changed, 74 deletions(-) delete mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 5ba8e628..00000000 --- a/docker-compose.yml +++ /dev/null @@ -1,74 +0,0 @@ -# For more information: https://laravel.com/docs/sail -version: '3' -services: - laravel.test: - build: - context: ./vendor/laravel/sail/runtimes/8.0 - dockerfile: Dockerfile - args: - WWWGROUP: '${WWWGROUP}' - image: sail-8.0/app - ports: - - '${APP_PORT:-80}:80' - environment: - WWWUSER: '${WWWUSER}' - LARAVEL_SAIL: 1 - volumes: - - '.:/var/www/html' - networks: - - sail - depends_on: - - mysql - - redis - # - selenium - # selenium: - # image: 'selenium/standalone-chrome' - # volumes: - # - '/dev/shm:/dev/shm' - # networks: - # - sail - # depends_on: - # - laravel.test - mysql: - image: 'mysql:8.0' - ports: - - '${FORWARD_DB_PORT:-3306}:3306' - environment: - MYSQL_ROOT_PASSWORD: '${DB_PASSWORD}' - MYSQL_DATABASE: '${DB_DATABASE}' - MYSQL_USER: '${DB_USERNAME}' - MYSQL_PASSWORD: '${DB_PASSWORD}' - MYSQL_ALLOW_EMPTY_PASSWORD: 'yes' - volumes: - - 'sailmysql:/var/lib/mysql' - networks: - - sail - redis: - image: 'redis:alpine' - ports: - - '${FORWARD_REDIS_PORT:-6379}:6379' - volumes: - - 'sailredis:/data' - networks: - - sail - # memcached: - # image: 'memcached:alpine' - # ports: - # - '11211:11211' - # networks: - # - sail - mailhog: - image: 'mailhog/mailhog:latest' - ports: - - 1025:1025 - - 8025:8025 - networks: - - sail -networks: - sail: - driver: bridge -volumes: - sailmysql: - driver: local - sailredis: - driver: local From a96fe9320704cbf18856d1009b8cdeffca8a636d Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 19 Jan 2021 16:20:53 +0100 Subject: [PATCH 7/7] Update CHANGELOG.md --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6eed5ab1..ca04d691 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ # Release Notes -## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.8...8.x) +## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.9...8.x) + + +## [v8.5.9 (2021-01-19)](https://github.com/laravel/laravel/compare/v8.5.8...v8.5.9) + +### Removed +- Delete `docker-compose.yml` ([#5522](https://github.com/laravel/laravel/pull/5522)) ## [v8.5.8 (2021-01-12)](https://github.com/laravel/laravel/compare/v8.5.7...v8.5.8)