dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'next' into feature/ai-templates

Browse Source
This commit is contained in:
Alexander G.
2024-10-04 12:29:30 +03:00
committed by GitHub
parent f0f685b78a 2ca73695b3
commit 59c54b8aec
6 changed files with 20 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Livewire/Help.php
View File

@@ -61,6 +61,7 @@ class Help extends Component
send_user_an_email($mail, auth()->user()?->email, 'hi@coollabs.io'); send_user_an_email($mail, auth()->user()?->email, 'hi@coollabs.io');
} }
$this->dispatch('success', 'Feedback sent.', 'We will get in touch with you as soon as possible.'); $this->dispatch('success', 'Feedback sent.', 'We will get in touch with you as soon as possible.');
$this->reset('description', 'subject');
} catch (\Throwable $e) { } catch (\Throwable $e) {
return handleError($e, $this); return handleError($e, $this);
} }

2
config/sentry.php
View File

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

2
config/version.php
View File

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

20
resources/views/livewire/tags/index.blade.php
View File

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

19
resources/views/livewire/tags/show.blade.php
View File

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

4
versions.json
View File

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