rosslh/coolify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resolve merge conflict

Browse source
This commit is contained in:
Andras Bacsai 2025-11-18 14:54:17 +01:00
parent 329708791e
commit acfee7d9f3
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Livewire/Project/Application/General.php
View file

@ -622,6 +622,7 @@ public function updatedIsStatic($value)
public function updatedBuildPack()
{
$originalBuildPack = $this->application->getOriginal('build_pack');
// Check if user has permission to update
try {
$this->authorize('update', $this->application);

13
app/Models/Application.php
View file

@ -188,16 +188,13 @@ protected static function booted()
// Remove SERVICE_FQDN_* and SERVICE_URL_* environment variables
$application->environment_variables()
->where(function ($q) {
$q->where('key', 'LIKE', 'SERVICE_FQDN_%')
->orWhere('key', 'LIKE', 'SERVICE_URL_%');
})
->where('key', 'LIKE', 'SERVICE_FQDN_%')
->orWhere('key', 'LIKE', 'SERVICE_URL_%')
->delete();
$application->environment_variables_preview()
->where(function ($q) {
$q->where('key', 'LIKE', 'SERVICE_FQDN_%')
->orWhere('key', 'LIKE', 'SERVICE_URL_%');
})
->where('key', 'LIKE', 'SERVICE_FQDN_%')
->orWhere('key', 'LIKE', 'SERVICE_URL_%')
->delete();
}