MrUnknownDE/panel
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/panel.git synced 2026-04-19 06:43:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Dane Everitt
2019-08-04 13:49:26 -07:00
parent 2716ff8841 bd5875084b
commit 81143e231a
41 changed files with 303 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Requests/Api/Application/Allocations/StoreAllocationRequest.php
View File

@@ -40,7 +40,7 @@ class StoreAllocationRequest extends ApplicationApiRequest
return [
'allocation_ip' => $data['ip'],
'allocation_ports' => $data['ports'],
'allocation_alias' => $data['alias'],
'allocation_alias' => $data['alias'] ?? null,
];
}
}

1
app/Http/Requests/Api/Application/Servers/StoreServerRequest.php
View File

@@ -41,6 +41,7 @@ class StoreServerRequest extends ApplicationApiRequest
'startup' => $rules['startup'],
'environment' => 'present|array',
'skip_scripts' => 'sometimes|boolean',
'oom_disabled' => 'sometimes|boolean',
// Resource limitations
'limits' => 'required|array',

1
app/Http/Requests/Api/Application/Servers/UpdateServerBuildConfigurationRequest.php
View File

@@ -18,6 +18,7 @@ class UpdateServerBuildConfigurationRequest extends ServerWriteRequest
return [
'allocation' => $rules['allocation_id'],
'oom_disabled' => $rules['oom_disabled'],
'limits' => 'sometimes|array',
'limits.memory' => $this->requiredToOptional('memory', $rules['memory'], true),