Remove some commented code

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

diff --git a/app/config/config.yml b/app/config/config.yml
index 421b2db5a527c213c3fd8343350a26768516269d..5fac31929408297b3c05d2cf3df29106f00cabf4 100644 (file)
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -30,8 +30,10 @@ wallabag_core:
         en: 'English'
         fr: 'Français'
         de: 'Deutsch'
-    import:
-        allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain']
+
+wallabag_import:
+    allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain']
+    resource_dir: "%kernel.root_dir%/../web/uploads/import"
 
 # Twig Configuration
 twig:
@@ -57,9 +59,8 @@ twig:
         warning_message: %warning_message%
         paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
         flattr_url: "https://flattr.com/thing/1265480"
-    form:
-        resources:
-            - LexikFormFilterBundle:Form:form_div_layout.html.twig
+    form_themes:
+        - "LexikFormFilterBundle:Form:form_div_layout.html.twig"
 
 # Assetic Configuration
 assetic:
@@ -100,6 +101,12 @@ stof_doctrine_extensions:
             tree: true
             sluggable: true
 
+doctrine_migrations:
+    dir_name: "%kernel.root_dir%/DoctrineMigrations"
+    namespace: Application\Migrations
+    table_name: migration_versions
+    name: Application Migrations
+
 # Swiftmailer Configuration
 swiftmailer:
     transport: "%mailer_transport%"
@@ -163,14 +170,8 @@ liip_theme:
     autodetect_theme: wallabag_core.helper.detect_active_theme
 
     path_patterns:
-        # app_resource:
-        #     - %%app_path%%/views/themes/%%current_theme%%/%%template%%
-        #     - %%app_path%%/views/%%template%%
         bundle_resource:
             - %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%
-        # bundle_resource_dir:
-        #     - %%dir%%/views/themes/%%current_theme%%/%%bundle_name%%/%%template%%
-        #     - %%dir%%/views/%%bundle_name%%/%%override_path%%
 
 fos_user:
     db_driver: orm