Merge branch 'develop' into class-string

This commit is contained in:
Lance Pioch 2017-09-25 11:10:50 -04:00
commit 6ffa4e62e0

View file

@ -28,6 +28,7 @@ use View;
use Cache; use Cache;
use Pterodactyl\Models; use Pterodactyl\Models;
use Pterodactyl\Observers; use Pterodactyl\Observers;
use Illuminate\Support\Facades\Schema;
use Illuminate\Support\ServiceProvider; use Illuminate\Support\ServiceProvider;
class AppServiceProvider extends ServiceProvider class AppServiceProvider extends ServiceProvider
@ -37,6 +38,8 @@ class AppServiceProvider extends ServiceProvider
*/ */
public function boot() public function boot()
{ {
Schema::defaultStringLength(191);
Models\User::observe(Observers\UserObserver::class); Models\User::observe(Observers\UserObserver::class);
Models\Server::observe(Observers\ServerObserver::class); Models\Server::observe(Observers\ServerObserver::class);
Models\Subuser::observe(Observers\SubuserObserver::class); Models\Subuser::observe(Observers\SubuserObserver::class);