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

Merge remote-tracking branch 'origin/main' into release/v4.5

Browse Source
This commit is contained in:
github-actions[bot]
2026-10-14 12:29:51 +00:00
parent 521b3cb90f 23a22e7970
commit 70f7744660
15 changed files with 385 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Api/GithubController.php
+8
View File
@@ -247,6 +247,10 @@ class GithubController extends Controller
], 422);
}
if (! isCloud() && $request->boolean('is_system_wide')) {
$this->authorize('makeSystemWide', GithubApp::class);
}
try {
// Verify the private key belongs to the team
$privateKey = PrivateKey::where('uuid', $request->input('private_key_uuid'))
@@ -663,6 +667,10 @@ class GithubController extends Controller
$payload['api_url'] = githubApiUrlFromHtmlUrl($payload['html_url']);
}
if (! isCloud() && filter_var($payload['is_system_wide'] ?? false, FILTER_VALIDATE_BOOLEAN) && ! $githubApp->is_system_wide) {
$this->authorize('makeSystemWide', GithubApp::class);
}
// Handle private_key_uuid -> private_key_id conversion
if (isset($payload['private_key_uuid'])) {
$privateKey = PrivateKey::where('team_id', $teamId)
app/Http/Controllers/Api/GitlabController.php
+8
View File
@@ -247,6 +247,10 @@ class GitlabController extends Controller
], 422);
}
if (! isCloud() && $request->boolean('is_system_wide')) {
$this->authorize('makeSystemWide', GitlabApp::class);
}
try {
$htmlUrl = rtrim((string) $request->input('html_url'), '/');
$apiUrl = filled($request->input('api_url'))
@@ -420,6 +424,10 @@ class GitlabController extends Controller
], 422);
}
if (! isCloud() && filter_var($payload['is_system_wide'] ?? false, FILTER_VALIDATE_BOOLEAN) && ! $gitlabApp->is_system_wide) {
$this->authorize('makeSystemWide', GitlabApp::class);
}
if (isset($payload['html_url'])) {
$payload['html_url'] = rtrim((string) $payload['html_url'], '/');
if (! filled($payload['api_url'] ?? null)) {