starred/coolify
1
0
Fork 0
mirror of https://github.com/coollabsio/coolify.git synced 2026-11-06 13:10:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into origin/next

Browse Source 
# Conflicts:
#	app/Livewire/Dashboard.php
#	app/Livewire/Dashboard/ActiveDeployments.php
#	resources/views/livewire/team/member.blade.php
#	tests/Feature/Security/PrivateKeyServerLookupTest.php
This commit is contained in:
Andras Bacsai
2026-10-29 21:20:31 +01:00
parent b85a9197a1 0d398ced24
commit ca6eb20a38
5 changed files with 48 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Services/AvatarStorageService.php
+2 -2
View File
@@ -28,11 +28,11 @@ class AvatarStorageService
$oldS3StorageId = $user->avatar_s3_storage_id;
$oldPath = $user->avatar_path;
$user->update([
$user->fill([
'avatar_path' => $path,
'avatar_storage_type' => $storageType,
'avatar_s3_storage_id' => $s3StorageId,
]);
])->touch();
if ($oldPath && ($oldStorageType !== $storageType || $oldS3StorageId !== $s3StorageId)) {
$this->disk($oldStorageType ?? 'local', $oldS3StorageId)->delete($oldPath);
app/Services/TeamAvatarStorageService.php
+1 -1
View File
@@ -28,7 +28,7 @@ class TeamAvatarStorageService extends AvatarStorageService
'avatar_path' => $path,
'avatar_storage_type' => $storageType,
'avatar_s3_storage_id' => $s3StorageId,
])->save();
])->touch();
if ($oldPath && ($oldStorageType !== $storageType || $oldS3StorageId !== $s3StorageId)) {
$this->disk($oldStorageType ?? 'local', $oldS3StorageId)->delete($oldPath);