diff --git a/composer.json b/composer.json index 79145682..84657bf5 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "venturecraft/revisionable": "^1.23", "pda/pheanstalk": "~3.0", "cviebrock/laravel-elasticsearch": "^1.0", - "barryvdh/laravel-debugbar": "^2.1", + "barryvdh/laravel-debugbar": "^2.2", "predis/predis": "^1.0", "ksubileau/color-thief-php": "^1.3" }, diff --git a/composer.lock b/composer.lock index 4c1fc94b..bb3ddc44 100644 --- a/composer.lock +++ b/composer.lock @@ -4,28 +4,28 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "34abdcf2e916a26919b81059ba38fa47", - "content-hash": "afae7bc6603035b2573af4b56c91c0dd", + "hash": "59213ec0fdecf24707ca8ee39ee41685", + "content-hash": "46f16166f90cd1546772880f9725b112", "packages": [ { "name": "barryvdh/laravel-debugbar", - "version": "v2.1.1", + "version": "v2.2.2", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-debugbar.git", - "reference": "974fd16e328ca851a081449100d9509af59cf0ff" + "reference": "c291e58d0a13953e0f68d99182ee77ebc693edc0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/974fd16e328ca851a081449100d9509af59cf0ff", - "reference": "974fd16e328ca851a081449100d9509af59cf0ff", + "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/c291e58d0a13953e0f68d99182ee77ebc693edc0", + "reference": "c291e58d0a13953e0f68d99182ee77ebc693edc0", "shasum": "" }, "require": { - "illuminate/support": "~5.0.17|5.1.*|5.2.*", + "illuminate/support": "5.1.*|5.2.*", "maximebf/debugbar": "~1.11.0", - "php": ">=5.4.0", - "symfony/finder": "~2.6|~3.0" + "php": ">=5.5.9", + "symfony/finder": "~2.7|~3.0" }, "type": "library", "extra": { @@ -59,7 +59,7 @@ "profiler", "webprofiler" ], - "time": "2015-12-22 06:22:38" + "time": "2016-05-11 13:54:43" }, { "name": "barryvdh/laravel-ide-helper", diff --git a/config/app.php b/config/app.php index 65f0e0f4..16ee148e 100644 --- a/config/app.php +++ b/config/app.php @@ -140,6 +140,7 @@ return [ /* * Application Service Providers... */ + Barryvdh\Debugbar\ServiceProvider::class, Poniverse\Ponyfm\Providers\AppServiceProvider::class, Poniverse\Ponyfm\Providers\EventServiceProvider::class, Poniverse\Ponyfm\Providers\RouteServiceProvider::class, @@ -148,7 +149,6 @@ return [ Intouch\LaravelNewrelic\NewrelicServiceProvider::class, Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class, Cviebrock\LaravelElasticsearch\ServiceProvider::class, - Barryvdh\Debugbar\ServiceProvider::class, ], diff --git a/vagrant/pony.fm.redis.config b/vagrant/pony.fm.redis.config index d5f743e1..20313f29 100644 --- a/vagrant/pony.fm.redis.config +++ b/vagrant/pony.fm.redis.config @@ -693,4 +693,4 @@ aof-rewrite-incremental-fsync yes # # include /path/to/local.conf # include /path/to/other.conf -include /etc/redis/conf.d/local.conf +# include /etc/redis/conf.d/local.conf