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

Merge pull request #238 from Pterodactyl/analysis-XpONKL

Browse source 
Apply fixes from StyleCI
This commit is contained in:
Dane Everitt 2017-01-03 17:46:46 -05:00 committed by GitHub
commit 0a23aa1a68
3 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Http/Controllers/Server/ServerController.php
View file

@ -31,7 +31,6 @@ use Alert;
use Javascript; use Javascript;
use Pterodactyl\Models; use Pterodactyl\Models;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use InvalidArgumentException;
use Pterodactyl\Exceptions\DisplayException; use Pterodactyl\Exceptions\DisplayException;
use Pterodactyl\Http\Controllers\Controller; use Pterodactyl\Http\Controllers\Controller;
use Pterodactyl\Repositories\ServerRepository; use Pterodactyl\Repositories\ServerRepository;

4
config/javascript.php
View file

@ -14,7 +14,7 @@ return [
| |
*/ */
'bind_js_vars_to_this_view' => [ 'bind_js_vars_to_this_view' => [
'layouts.master' 'layouts.master',
], ],
/* /*
@ -27,6 +27,6 @@ return [
| That way, you can access vars, like "SomeNamespace.someVariable." | That way, you can access vars, like "SomeNamespace.someVariable."
| |
*/ */
'js_namespace' => 'Pterodactyl' 'js_namespace' => 'Pterodactyl',
]; ];

2
database/migrations/2017_01_03_150436_fix_misnamed_option_tag.php
View file

@ -1,7 +1,5 @@
<?php <?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Migrations\Migration;
class FixMisnamedOptionTag extends Migration class FixMisnamedOptionTag extends Migration