Skip to content

Commit b87e03f

Browse files
committed
Merge branch '4.x'
2 parents 7b7f47e + 4121a25 commit b87e03f

File tree

4 files changed

+12
-41
lines changed

4 files changed

+12
-41
lines changed

.github/ISSUE_TEMPLATE/1_Bug_report.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: Bug Report
2-
description: "Report a general library issue."
2+
description: "Report something that's broken."
33
body:
44
- type: markdown
55
attributes:
6-
value: "Before submitting your report, [please ensure your Laravel version is still supported](https://laravel.com/docs/releases#support-policy)."
6+
value: "Please read [our full contribution guide](https://laravel.com/docs/contributions#bug-reports) before submitting bug reports. If you notice improper DocBlock, PHPStan, or IDE warnings while using Laravel, do not create a GitHub issue. Instead, please submit a pull request to fix the problem."
77
- type: input
88
attributes:
99
label: Jetstream Version
@@ -22,7 +22,7 @@ body:
2222
- type: input
2323
attributes:
2424
label: Laravel Version
25-
description: Provide the Laravel version that you are using.
25+
description: Provide the Laravel version that you are using. [Please ensure it is still supported.](https://laravel.com/docs/releases#support-policy)
2626
placeholder: 10.4.1
2727
validations:
2828
required: true

.github/workflows/static-analysis.yml

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -12,30 +12,4 @@ permissions:
1212

1313
jobs:
1414
tests:
15-
runs-on: ubuntu-22.04
16-
17-
strategy:
18-
fail-fast: true
19-
20-
name: Static Analysis
21-
22-
steps:
23-
- name: Checkout code
24-
uses: actions/checkout@v4
25-
26-
- name: Setup PHP
27-
uses: shivammathur/setup-php@v2
28-
with:
29-
php-version: 8.2
30-
tools: composer:v2
31-
coverage: none
32-
33-
- name: Install dependencies
34-
uses: nick-fields/retry@v2
35-
with:
36-
timeout_minutes: 5
37-
max_attempts: 5
38-
command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress
39-
40-
- name: Execute type checking
41-
run: vendor/bin/phpstan
15+
uses: laravel/.github/.github/workflows/static-analysis.yml@main

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Release Notes
22

3-
## [Unreleased](https://github.com/laravel/jetstream/compare/v4.2.1...master)
3+
## [Unreleased](https://github.com/laravel/jetstream/compare/v4.2.2...master)
4+
5+
## [v4.2.2](https://github.com/laravel/jetstream/compare/v4.2.1...v4.2.2) - 2024-01-17
6+
7+
* [4.x] Fix home route by [@jessarcher](https://github.com/jessarcher) in https://github.com/laravel/jetstream/pull/1432
48

59
## [v4.2.1](https://github.com/laravel/jetstream/compare/v4.2.0...v4.2.1) - 2023-12-27
610

stubs/inertia/resources/js/Pages/Welcome.vue

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -111,18 +111,11 @@ defineProps({
111111
</div>
112112

113113
<div class="flex justify-center mt-16 px-6 sm:items-center sm:justify-between">
114-
<div class="text-center text-sm text-gray-500 dark:text-gray-400 sm:text-start">
115-
<div class="flex items-center gap-4">
116-
<a href="https://github.com/sponsors/taylorotwell" class="group inline-flex items-center hover:text-gray-700 dark:hover:text-white focus:outline focus:outline-2 focus:rounded-sm focus:outline-red-500">
117-
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" class="-mt-px me-1 w-5 h-5 stroke-gray-400 dark:stroke-gray-600 group-hover:stroke-gray-600 dark:group-hover:stroke-gray-400">
118-
<path stroke-linecap="round" stroke-linejoin="round" d="M21 8.25c0-2.485-2.099-4.5-4.688-4.5-1.935 0-3.597 1.126-4.312 2.733-.715-1.607-2.377-2.733-4.313-2.733C5.1 3.75 3 5.765 3 8.25c0 7.22 9 12 9 12s9-4.78 9-12z" />
119-
</svg>
120-
Sponsor
121-
</a>
122-
</div>
114+
<div class="text-center text-sm sm:text-start">
115+
&nbsp;
123116
</div>
124117

125-
<div class="ms-4 text-center text-sm text-gray-500 dark:text-gray-400 sm:text-end sm:ms-0">
118+
<div class="text-center text-sm text-gray-500 dark:text-gray-400 sm:text-end sm:ms-0">
126119
Laravel v{{ laravelVersion }} (PHP v{{ phpVersion }})
127120
</div>
128121
</div>

0 commit comments

Comments
 (0)