StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into dane/restore-backups

Browse source
This commit is contained in:
Dane Everitt 2021-01-30 10:10:29 -08:00
commit be26921fcc
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
41 changed files with 440 additions and 362 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Auth/ResetPasswordController.php
View file

@ -88,7 +88,7 @@ class ResetPasswordController extends Controller
* form with a note telling them their password was changed and to log back in.
*
* @param \Illuminate\Contracts\Auth\CanResetPassword|\Pterodactyl\Models\User $user
* @param string $password
* @param string $password
*
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException

2
app/Http/Requests/Admin/Egg/EggFormRequest.php
View file

@ -22,7 +22,7 @@ class EggFormRequest extends AdminFormRequest
'name' => 'required|string|max:191',
'description' => 'nullable|string',
'docker_images' => 'required|string',
'file_denylist' => 'string',
'file_denylist' => 'array',
'startup' => 'required|string',
'config_from' => 'sometimes|bail|nullable|numeric',
'config_stop' => 'required_without:config_from|nullable|string|max:191',