Merge branch 'master' into 2.1

2016-06-23 11:47:46 +02:00
parent 49e2854d5c fb5c17a9ab
commit f49d9ca383
54 changed files with 133 additions and 102 deletions
--- a/app/config/config_dev.yml
+++ b/app/config/config_dev.yml
@ -17,14 +17,14 @@ monolog:
            type:   stream
            path:   "%kernel.logs_dir%/%kernel.environment%.log"
            level:  debug
-            channels: [!event]
+            channels: ['!event']
        console:
            type:   console
            bubble: false
            verbosity_levels:
                VERBOSITY_VERBOSE: INFO
                VERBOSITY_VERY_VERBOSE: DEBUG
-            channels: [!event, !doctrine]
+            channels: ['!event', '!doctrine']
        console_very_verbose:
            type:   console
            bubble: false