[6.x] Merge 5.x into master (#1555)

* Update CHANGELOG.md

* Update branch alias

* Do not override all options provided by connection (#960)

* [6.x] Update to bootstrap 5.1 and drop jQuery (#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 (#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>

Author: 7 people

composer.json

@@ -50,7 +50,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.x-dev"
+            "dev-master": "6.x-dev"
         },
         "laravel": {
             "providers": [

dist/app.js

@@ -29,7 +29,7 @@
             </tr>
 
             <tr v-if="! showAll">
-                <td class="card-bg-secondary"><a href="*" v-on:click.prevent="showAll = true">Show All</a></td>
+                <td class="card-bg-secondary"><a href="*" class="text-decoration-none" v-on:click.prevent="showAll = true">Show All</a></td>
             </tr>
             </tbody>
         </table>

resources/js/components/Stacktrace.vue

@@ -18,13 +18,13 @@
 
             <ul class="nav nav-pills card-bg-secondary">
                 <li class="nav-item">
-                    <router-link class="nav-link" active-class="active" :to="{ name: 'metrics-jobs'}" href="#">
+                    <router-link class="nav-link text-decoration-none" active-class="active" :to="{ name: 'metrics-jobs'}" href="#">
                         Jobs
                     </router-link>
                 </li>
 
                 <li class="nav-item">
-                    <router-link class="nav-link" active-class="active" :to="{ name: 'metrics-queues'}" href="#">
+                    <router-link class="nav-link text-decoration-none" active-class="active" :to="{ name: 'metrics-queues'}" href="#">
                         Queues
                     </router-link>
                 </li>

resources/js/screens/metrics/index.vue

@@ -67,7 +67,7 @@
 
             <tr v-for="job in jobs" :key="job">
                 <td>
-                    <router-link :to="{ name: 'metrics-preview', params: { type: 'jobs', slug: job }}">
+                    <router-link class="text-decoration-none" :to="{ name: 'metrics-preview', params: { type: 'jobs', slug: job }}">
                         {{ job }}
                     </router-link>
                 </td>

resources/js/screens/metrics/jobs.vue

@@ -67,7 +67,7 @@
 
             <tr v-for="queue in queues" :key="queue">
                 <td>
-                    <router-link :to="{ name: 'metrics-preview', params: { type: 'queues', slug: queue }}">
+                    <router-link class="text-decoration-none" :to="{ name: 'metrics-preview', params: { type: 'queues', slug: queue }}">
                         {{ queue }}
                     </router-link>
                 </td>

resources/js/screens/metrics/queues.vue

@@ -11,13 +11,13 @@
 
             <ul class="nav nav-pills card-bg-secondary">
                 <li class="nav-item">
-                    <router-link class="nav-link" active-class="active" :to="{ name: 'monitoring-jobs', params: { tag:$route.params.tag }}" href="#">
+                    <router-link class="nav-link text-decoration-none" active-class="active" :to="{ name: 'monitoring-jobs', params: { tag:$route.params.tag }}" href="#">
                         Recent Jobs
                     </router-link>
                 </li>
 
                 <li class="nav-item">
-                    <router-link class="nav-link" active-class="active" :to="{ name: 'monitoring-failed', params: { tag:$route.params.tag }}" href="#">
+                    <router-link class="nav-link text-decoration-none" active-class="active" :to="{ name: 'monitoring-failed', params: { tag:$route.params.tag }}" href="#">
                         Failed Jobs
                     </router-link>
                 </li>