Skynet/misc_pterodactyl-panel
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into v2

Browse source
This commit is contained in:
Matthew Penner 2021-09-15 10:30:40 -06:00
commit 23a160b9e1
No known key found for this signature in database
GPG key ID: 030E4AB751DC756F
4 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/Transformers/Api/Application/ServerTransformer.php
View file

@ -56,6 +56,7 @@ class ServerTransformer extends Transformer
'io' => $model->io,
'cpu' => $model->cpu,
'threads' => $model->threads,
'oom_disabled' => $model->oom_disabled,
],
'feature_limits' => [
'databases' => $model->database_limit,
@ -72,7 +73,6 @@ class ServerTransformer extends Transformer
'image' => $model->image,
'environment' => $this->environmentService->handle($model),
],
'oom_killer' => !$model->oom_disabled,
'updated_at' => self::formatTimestamp($model->updated_at),
'created_at' => self::formatTimestamp($model->created_at),
];