1
1
mirror of https://github.com/pterodactyl/panel.git synced 2024-11-22 17:12:30 +01:00

Merge branch 'develop' into feature/service-export-import

This commit is contained in:
Dane Everitt 2017-10-17 21:31:35 -05:00
commit 5e712f0bb1
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
7 changed files with 4 additions and 15 deletions

View File

@ -27,6 +27,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
* Using default value in rules when creating a new variable if the rules is empty.
* Fixes a design-flaw in the allocation management part of nodes that would run a MySQL query for each port being allocated. This behavior is now changed to only execute one query to add multiple ports at once.
* Attempting to create a server when no nodes are configured now redirects to the node creation page.
* Fixes missing library issue for teamspeak when used with mariadb.
## v0.6.4 (Courageous Carniadactylus)
### Fixed

View File

@ -115,7 +115,6 @@ class AppSettingsCommand extends Command
$this->checkForRedis();
$this->writeToEnvironment($this->variables);
$this->command->call('config:cache');
$this->info($this->command->output());
}

View File

@ -122,7 +122,6 @@ class DatabaseSettingsCommand extends Command
$this->writeToEnvironment($this->variables);
$this->console->call('config:cache');
$this->info($this->console->output());
return 0;

View File

@ -92,7 +92,6 @@ class EmailSettingsCommand extends Command
$this->writeToEnvironment($this->variables);
$this->line('Updating stored environment configuration file.');
$this->call('config:cache');
$this->line('');
}

View File

@ -131,7 +131,7 @@ class UserController extends Controller
$this->deletionService->handle($user);
return redirect()->route('admin.users.view', $user->id);
return redirect()->route('admin.users');
}
/**

View File

@ -68,21 +68,13 @@
}
},
"scripts": {
"pre-install-cmd": [
"rm -f bootstrap/cache/services.php bootstrap/cache/compiled.php"
],
"pre-update-cmd": [
"rm -f bootstrap/cache/services.php bootstrap/cache/compiled.php"
],
"post-install-cmd": [
"Illuminate\\Foundation\\ComposerScripts::postInstall",
"php artisan optimize",
"php artisan config:cache"
"php artisan optimize"
],
"post-update-cmd": [
"Illuminate\\Foundation\\ComposerScripts::postUpdate",
"php artisan optimize",
"php artisan config:cache"
"php artisan optimize"
]
},
"prefer-stable": true,

View File

@ -276,6 +276,5 @@ class EmailSettingsCommandTest extends CommandTestCase
{
$this->config->shouldReceive('get')->withAnyArgs()->zeroOrMoreTimes()->andReturnNull();
$this->command->shouldReceive('writeToEnvironment')->with($data)->once()->andReturnNull();
$this->command->shouldReceive('call')->with('config:cache')->once()->andReturnNull();
}
}