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

Merge branch 'develop' into feature/react-admin

Browse source
This commit is contained in:
Matthew Penner 2021-01-27 23:18:06 -07:00
commit b856ab17bd
39 changed files with 438 additions and 359 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/Transformers/Api/Application/EggTransformer.php
View file

@ -16,7 +16,11 @@ class EggTransformer extends BaseTransformer
* @var array
*/
protected $availableIncludes = [
'nest', 'servers', 'config', 'script', 'variables',
'nest',
'servers',
'config',
'script',
'variables',
];
/**
@ -52,7 +56,7 @@ class EggTransformer extends BaseTransformer
'startup' => json_decode($model->config_startup, true),
'stop' => $model->config_stop,
'logs' => json_decode($model->config_logs, true),
'file_denylist' => explode(PHP_EOL, $model->file_denylist),
'file_denylist' => $model->file_denylist,
'extends' => $model->config_from,
],
'startup' => $model->startup,