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/Client/ServerTransformer.php
View file

@ -51,6 +51,8 @@ class ServerTransformer extends Transformer
'disk' => $server->disk,
'io' => $server->io,
'cpu' => $server->cpu,
'threads' => $server->threads,
'oom_disabled' => $server->oom_disabled,
],
'invocation' => $this->service->handle($server, $this->user()->cannot(Permission::ACTION_STARTUP_READ, $server)),
'docker_image' => $server->image,