Merge 5.x into Master #1561
Merged
Merge 5.x into Master #1561
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…laravel#1161) * when register horizon, keep the original redis options, only overwrite prefix * delete space * Update Horizon.php Co-authored-by: Taylor Otwell <taylor@laravel.com>
Bumps [terser](https://github.com/terser/terser) from 4.8.0 to 4.8.1. - [Release notes](https://github.com/terser/terser/releases) - [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md) - [Commits](https://github.com/terser/terser/commits) --- updated-dependencies: - dependency-name: terser dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [moment](https://github.com/moment/moment) from 2.29.2 to 2.29.4. - [Release notes](https://github.com/moment/moment/releases) - [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md) - [Commits](moment/moment@2.29.2...2.29.4) --- updated-dependencies: - dependency-name: moment dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Boyscouting * WIP: TDD * Code style * Remove unused event * Ignore queues with wait time of 0
Bumps [moment-timezone](https://github.com/moment/moment-timezone) from 0.5.33 to 0.5.35. - [Release notes](https://github.com/moment/moment-timezone/releases) - [Changelog](https://github.com/moment/moment-timezone/blob/develop/changelog.md) - [Commits](moment/moment-timezone@0.5.33...0.5.35) --- updated-dependencies: - dependency-name: moment-timezone dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…us of last job retry (laravel#1182) * [5.x] Failed jobs list: Modify job retried tooltip label to include status of last retry * [5.x] Failed jobs list: Modify job retried tooltip label to include status of last retry - Simplified logic by removing unnecessary checks, since when method is called there will always have been a retry * [5.x] Failed jobs list: Modify job retried tooltip label to include status of last retry - Updated comment * Update index.vue * Update index.vue Co-authored-by: Jeandre van Zyl <jeandre@sinov8.net> Co-authored-by: Taylor Otwell <taylor@laravel.com>
* Update .gitattributes * Update .gitattributes Co-authored-by: Dries Vints <dries@vints.io>
* Add exit codes to status command * StyleCI
* Improves GitHub Workflow * Avoid using `^` deps (incompatible with Composer on Windows), while this is not used in Telescope, this repository will be used as reference to setup GitHub Action and I believe we should use the best configuration. * Use `include` instead of `exclude` * wip * wip * wip
) (laravel#1196) * fix laravel#1093, delete tags which contain forward slashes * remove double ; Co-authored-by: Stefan Gotre <stefan.gotre@teraone.de>
* Add missing anchor title for clarity * Compile Assets Co-authored-by: stevebauman <stevebauman@users.noreply.github.com>
…el#1211) * Add failing test * Use microtime for pushed at timestamp * Update test * CS fixes
* Supports Laravel 12 Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com> * wip Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com> * Update composer.json --------- Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.4.6 to 5.4.14. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/v5.4.14/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v5.4.14/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* scale workers from min instead of max on startup * start supervisor with balanced worker count instead of min
laravel#1538) * scale workers from min instead of max on startup * start supervisor with balanced worker count instead of min * Add proxy_path variable for reverse proxy support - Introduced `proxy_path` variable in Horizon configuration * Update horizon.php --------- Co-authored-by: Taylor Otwell <taylor@laravel.com>
* Update WorkloadRepository.php * Update WorkloadRepository.php * Update RedisWorkloadRepository.php
…avel#1550) * Update MonitorSupervisorMemory.php * add getters/setters * Update SupervisorOutOfMemory.php * Update SupervisorOutOfMemory.php --------- Co-authored-by: Taylor Otwell <taylor@laravel.com>
laravel#1552) * Set AutoScaler logic to target process scaling based on queue size when balancing is disabled. * Simplify scaling test * Fix still using maxProcesses when runtime > 0
…DX (laravel#1554) * Make $user = null the default in viewHorizon gate closure for better DX Signed-off-by: mitoop <me@mitoop.com> * add optional Signed-off-by: mitoop <me@mitoop.com> --------- Signed-off-by: mitoop <me@mitoop.com>
* Update CHANGELOG.md * Update branch alias * Do not override all options provided by connection (laravel#960) * [6.x] Update to bootstrap 5.1 and drop jQuery (laravel#1119) * Update bootstrap and remove jQuery and popper.js dependencies Popper.js is needed for tooltips, using the browser native title attribute removes the need to keep this * Update utility classes https://getbootstrap.com/docs/5.1/migration/#utilities * Fix badge color classes https://getbootstrap.com/docs/5.1/migration/#badges * Remove text decoration of anchor tags https://getbootstrap.com/docs/5.1/migration/#content-reboot-etc * Fix data-toggle attribute https://getbootstrap.com/docs/5.1/migration/#javascript * Remove text-decoration of route-link elements https://getbootstrap.com/docs/5.1/migration/#content-reboot-etc * Remove new border styling under thead * Fix vue-json-pretty output with overflowing text * Apply fixes for updated vue-json-pretty css laravel/telescope#1049 * compile * Redirects to batches page when batch not found (laravel#1383) * fix: redirects to batches page when batch not found * Update BatchesController.php --------- Co-authored-by: Taylor Otwell <taylor@laravel.com> * Apply fixes from StyleCI * Compile Assets --------- Co-authored-by: Dries Vints <dries@vints.io> Co-authored-by: Edvinas Kručas <edv.krucas@gmail.com> Co-authored-by: Taylor Otwell <taylor@laravel.com> Co-authored-by: Markus Machatschek <mmachatschek@users.noreply.github.com> Co-authored-by: Irakli Shengelia <59525444+irakliShengelia@users.noreply.github.com> Co-authored-by: StyleCI Bot <bot@styleci.io> Co-authored-by: bert-w <10498595+bert-w@users.noreply.github.com>
Bumps [axios](https://github.com/axios/axios) from 1.7.4 to 1.8.2. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](axios/axios@v1.7.4...v1.8.2) --- updated-dependencies: - dependency-name: axios dependency-version: 1.8.2 dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Apparently I forgot a bunch of commits in the last PR, since my local 5.x branch was not up to date.
I checked the PRs on the main Horizon repo and the last PR to master was on feb 2024 ( https://github.com/laravel/horizon/pulls?q=base%3Amaster ), so I picked all
5.xchanges over the ones inmaster.