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

Merge branch 'develop' into feature/user-databases

Browse source
This commit is contained in:
Dane Everitt 2018-03-02 18:40:38 -06:00
commit aaccf38640
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -9,6 +9,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
* Handle 404 errors from missing models in the application API bindings correctly.
* Fix validation error returned when no environment variables are passed, even if there are no variables required.
* Fix improper permissions on `PATCH /api/servers/<id>/startup` endpoint which was preventing enditing any start variables.
* Should fix migration issues from 0.6 when there are more than API key in the database.
### Changed
* Changes order that validation of resource existence occurs in API requests to not try and use a non-existent model when validating data.

2
database/migrations/2018_01_13_142012_SetupTableForKeyEncryption.php
View file

@ -16,7 +16,7 @@ class SetupTableForKeyEncryption extends Migration
public function up()
{
Schema::table('api_keys', function (Blueprint $table) {
$table->char('identifier', 16)->unique()->after('user_id');
$table->char('identifier', 16)->nullable()->unique()->after('user_id');
$table->dropUnique(['token']);
});