aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/config
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2016-06-23 11:47:46 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-06-23 11:47:46 +0200
commitf49d9ca383c9f8a1bc426cfabf6b1cea53ea26b4 (patch)
tree156b1a29cfbe1962e68d409c3dea5a3911a34e9c /app/config
parent49e2854d5c15bbce3f24f91da34450e8f209295b (diff)
parentfb5c17a9ab5e10b1de9caa50e73638fdae19cb78 (diff)
downloadwallabag-f49d9ca383c9f8a1bc426cfabf6b1cea53ea26b4.tar.gz
wallabag-f49d9ca383c9f8a1bc426cfabf6b1cea53ea26b4.tar.zst
wallabag-f49d9ca383c9f8a1bc426cfabf6b1cea53ea26b4.zip
Merge branch 'master' into 2.1
Diffstat (limited to 'app/config')
-rw-r--r--app/config/config.yml10
-rw-r--r--app/config/config_dev.yml4
-rw-r--r--app/config/config_prod.yml4
3 files changed, 9 insertions, 9 deletions
diff --git a/app/config/config.yml b/app/config/config.yml
index c371cf73..29847820 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -156,7 +156,7 @@ liip_theme:
156 156
157 path_patterns: 157 path_patterns:
158 bundle_resource: 158 bundle_resource:
159 - %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%% 159 - "%%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%"
160 160
161fos_user: 161fos_user:
162 db_driver: orm 162 db_driver: orm
@@ -164,9 +164,9 @@ fos_user:
164 user_class: Wallabag\UserBundle\Entity\User 164 user_class: Wallabag\UserBundle\Entity\User
165 registration: 165 registration:
166 confirmation: 166 confirmation:
167 enabled: %fosuser_confirmation% 167 enabled: "%fosuser_confirmation%"
168 from_email: 168 from_email:
169 address: %from_email% 169 address: "%from_email%"
170 sender_name: wallabag 170 sender_name: wallabag
171fos_oauth_server: 171fos_oauth_server:
172 db_driver: orm 172 db_driver: orm
@@ -184,8 +184,8 @@ scheb_two_factor:
184 cookie_lifetime: 2592000 184 cookie_lifetime: 2592000
185 185
186 email: 186 email:
187 enabled: %twofactor_auth% 187 enabled: "%twofactor_auth%"
188 sender_email: %twofactor_sender% 188 sender_email: "%twofactor_sender%"
189 digits: 6 189 digits: 6
190 template: WallabagUserBundle:Authentication:form.html.twig 190 template: WallabagUserBundle:Authentication:form.html.twig
191 mailer: wallabag_user.auth_code_mailer 191 mailer: wallabag_user.auth_code_mailer
diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml
index 410d5a6c..f3030ff1 100644
--- a/app/config/config_dev.yml
+++ b/app/config/config_dev.yml
@@ -17,14 +17,14 @@ monolog:
17 type: stream 17 type: stream
18 path: "%kernel.logs_dir%/%kernel.environment%.log" 18 path: "%kernel.logs_dir%/%kernel.environment%.log"
19 level: debug 19 level: debug
20 channels: [!event] 20 channels: ['!event']
21 console: 21 console:
22 type: console 22 type: console
23 bubble: false 23 bubble: false
24 verbosity_levels: 24 verbosity_levels:
25 VERBOSITY_VERBOSE: INFO 25 VERBOSITY_VERBOSE: INFO
26 VERBOSITY_VERY_VERBOSE: DEBUG 26 VERBOSITY_VERY_VERBOSE: DEBUG
27 channels: [!event, !doctrine] 27 channels: ['!event', '!doctrine']
28 console_very_verbose: 28 console_very_verbose:
29 type: console 29 type: console
30 bubble: false 30 bubble: false
diff --git a/app/config/config_prod.yml b/app/config/config_prod.yml
index 342837a0..65b040cc 100644
--- a/app/config/config_prod.yml
+++ b/app/config/config_prod.yml
@@ -2,8 +2,8 @@ imports:
2 - { resource: config.yml } 2 - { resource: config.yml }
3 3
4#framework: 4#framework:
5# validation: 5# cache:
6# cache: apc 6# system: cache.adapter.apcu
7 7
8#doctrine: 8#doctrine:
9# orm: 9# orm: