Merge branch 'master' into 2.1

[github/wallabag/wallabag.git] / app / config / config_dev.yml

diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml
index 6b077fdbd2245f54885c118f8f28ceec4ad28cef..f3030ff1620eb3a249e8fc0bb40d36340c09947d 100644 (file)
--- 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
@@ -34,14 +34,8 @@ monolog:
                 VERBOSITY_DEBUG: DEBUG
             channels: [doctrine]
 
-assetic:
-    use_controller: true
-
 swiftmailer:
     # see http://mailcatcher.me/
     transport: smtp
     host: 'localhost'
     port: 1025
-    username: null
-    password: null
-