Merge branch 'next' into feature/ai-templates

Author: rennokki

app/Livewire/Help.php

@@ -61,6 +61,7 @@ public function submit()
                 send_user_an_email($mail, auth()->user()?->email, '[email protected]');
             }
             $this->dispatch('success', 'Feedback sent.', 'We will get in touch with you as soon as possible.');
+            $this->reset('description', 'subject');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

config/sentry.php

@@ -7,7 +7,7 @@
 
     // The release version of your application
     // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
-    'release' => '4.0.0-beta.355',
+    'release' => '4.0.0-beta.356',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 

config/version.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.355';
+return '4.0.0-beta.356';

resources/views/livewire/tags/index.blade.php

@@ -20,18 +20,14 @@
                             <div class="w-[500px]">
                                 <x-forms.input readonly label="Deploy Webhook URL" id="webhook" />
                             </div>
-                            <x-modal-confirmation 
-                            title="Redeploy all resources with this tag?"
-                            isHighlighted
-                            buttonTitle="Redeploy All"
-                            submitAction="redeploy_all"
-                            :actions="['All resources with this tag will be redeployed.', 'During redeploy resources will be temporarily unavailable.']"
-                            confirmationText="{{ $oneTag->name }}"
-                            confirmationLabel="Please confirm the execution of the actions by entering the Tag Name below"
-                            shortConfirmationLabel="Tag Name"
-                            :confirmWithPassword="false"
-                            step2ButtonText="Redeploy All"
-                            />
+                            <x-modal-confirmation title="Redeploy all resources with this tag?" isHighlighted
+                                buttonTitle="Redeploy All" submitAction="redeploy_all" :actions="[
+                                    'All resources with this tag will be redeployed.',
+                                    'During redeploy resources will be temporarily unavailable.',
+                                ]"
+                                confirmationText="{{ $tag }}"
+                                confirmationLabel="Please confirm the execution of the actions by entering the Tag Name below"
+                                shortConfirmationLabel="Tag Name" :confirmWithPassword="false" step2ButtonText="Redeploy All" />
                         </div>
                         <div class="grid grid-cols-1 gap-2 pt-4 lg:grid-cols-2 xl:grid-cols-3">
                             @foreach ($applications as $application)

resources/views/livewire/tags/show.blade.php

@@ -24,18 +24,13 @@
             <div class="w-[500px]">
                 <x-forms.input readonly label="Deploy Webhook URL" id="webhook" />
             </div>
-            <x-modal-confirmation 
-            title="Redeploy all resources with this tag?"
-            isHighlighted
-            buttonTitle="Redeploy All"
-            submitAction="redeploy_all"
-            :actions="['All resources with this tag will be redeployed.', 'During redeploy resources will be temporarily unavailable.']"
-            confirmationText="{{ $oneTag->name }}"
-            confirmationLabel="Please confirm the execution of the actions by entering the Tag Name below"
-            shortConfirmationLabel="Tag Name"
-            :confirmWithPassword="false"
-            step2ButtonText="Redeploy All"
-            />
+            <x-modal-confirmation title="Redeploy all resources with this tag?" isHighlighted buttonTitle="Redeploy All"
+                submitAction="redeploy_all" :actions="[
+                    'All resources with this tag will be redeployed.',
+                    'During redeploy resources will be temporarily unavailable.',
+                ]" confirmationText="{{ $tag }}"
+                confirmationLabel="Please confirm the execution of the actions by entering the Tag Name below"
+                shortConfirmationLabel="Tag Name" :confirmWithPassword="false" step2ButtonText="Redeploy All" />
         </div>
         <div class="grid grid-cols-1 gap-2 pt-4 lg:grid-cols-2 xl:grid-cols-3">
             @foreach ($applications as $application)

versions.json

@@ -1,10 +1,10 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.355"
+            "version": "4.0.0-beta.356"
         },
         "nightly": {
-            "version": "4.0.0-beta.356"
+            "version": "4.0.0-beta.357"
         },
         "helper": {
             "version": "1.0.1"