Skip to content

Commit fe3993a

Browse files
committed
Merge branch '5.x'
# Conflicts: # CHANGELOG.md
2 parents 61e038c + 26b737d commit fe3993a

File tree

6 files changed

+13
-12
lines changed

6 files changed

+13
-12
lines changed

CHANGELOG.md

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

3-
## [Unreleased](https://github.com/laravel/horizon/compare/v5.6.1...master)
3+
## [Unreleased](https://github.com/laravel/horizon/compare/v5.6.2...master)
4+
5+
6+
## [v5.6.2 (2020-12-15)](https://github.com/laravel/horizon/compare/v5.6.1...v5.6.2)
7+
8+
### Fixed
9+
- Fix missing tag check in payload ([#945](https://github.com/laravel/horizon/pull/945))
410

511

612
## [v5.6.1 (2020-12-08)](https://github.com/laravel/horizon/compare/v5.6.0...v5.6.1)

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

phpunit.xml.dist

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@
1919
<directory suffix="Test.php">./tests</directory>
2020
</testsuite>
2121
</testsuites>
22-
<filter>
23-
<whitelist processUncoveredFilesFromWhitelist="true">
24-
<directory suffix=".php">./src</directory>
25-
</whitelist>
26-
</filter>
2722
<php>
2823
<server name="REDIS_CLIENT" value="predis"/>
2924
</php>

public/app.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/mix-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"/app.js": "/app.js?id=f08fac3d93b97b1e98b9",
2+
"/app.js": "/app.js?id=05750b268046b665ce78",
33
"/app.css": "/app.css?id=9ce01eaaba790566b895",
44
"/app-dark.css": "/app-dark.css?id=821c845f9bf3b7853c33"
55
}

resources/js/screens/recentJobs/job-row.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<small class="text-muted">
1717
Queue: {{job.queue}}
1818

19-
<span v-if="job.payload.tags.length" class="text-break">
19+
<span v-if="job.payload.tags && job.payload.tags.length" class="text-break">
2020
| Tags: {{ job.payload.tags && job.payload.tags.length ? job.payload.tags.slice(0,3).join(', ') : '' }}<span v-if="job.payload.tags.length > 3"> ({{ job.payload.tags.length - 3 }} more)</span>
2121
</span>
2222
</small>

0 commit comments

Comments
 (0)