From bc78968764c741019a6b866ad434678cdbecbba4 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Wed, 20 Jan 2016 19:54:57 +0100 Subject: Move default configuration out of parameters These default configuration value shouldn't be in parameters.yml. --- app/config/config.yml | 4 ++++ app/config/parameters.yml.dist | 7 ------- app/config/tests/parameters.yml.dist.mysql | 7 ------- app/config/tests/parameters.yml.dist.pgsql | 7 ------- app/config/tests/parameters.yml.dist.sqlite | 7 ------- 5 files changed, 4 insertions(+), 28 deletions(-) (limited to 'app') diff --git a/app/config/config.yml b/app/config/config.yml index a6cfc67d..943365e8 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -33,6 +33,10 @@ wallabag_core: fr: 'Français' de: 'Deutsch' tr: 'Türkçe' + items_on_page: 12 + theme: material + language: en + rss_limit: 50 wallabag_import: allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain'] diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index e4fcbd74..f9555676 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -68,12 +68,5 @@ parameters: wallabag_url: http://v2.wallabag.org wallabag_support_url: 'https://www.wallabag.org/pages/support.html' - # default user config - items_on_page: 12 - theme: material - language: en - from_email: no-reply@wallabag.org - rss_limit: 50 - # pocket import pocket_consumer_key: xxxxxxxx diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql index f902f239..e0e92760 100644 --- a/app/config/tests/parameters.yml.dist.mysql +++ b/app/config/tests/parameters.yml.dist.mysql @@ -58,12 +58,5 @@ parameters: wallabag_url: http://v2.wallabag.org wallabag_support_url: 'https://www.wallabag.org/pages/support.html' - # default user config - items_on_page: 12 - theme: material - language: en_US - from_email: no-reply@wallabag.org - rss_limit: 50 - # pocket import pocket_consumer_key: xxxxxxxx diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql index 76685b14..e6e7636c 100644 --- a/app/config/tests/parameters.yml.dist.pgsql +++ b/app/config/tests/parameters.yml.dist.pgsql @@ -58,12 +58,5 @@ parameters: wallabag_url: http://v2.wallabag.org wallabag_support_url: 'https://www.wallabag.org/pages/support.html' - # default user config - items_on_page: 12 - theme: material - language: en_US - from_email: no-reply@wallabag.org - rss_limit: 50 - # pocket import pocket_consumer_key: xxxxxxxx diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite index cdafb1b1..c47392a3 100644 --- a/app/config/tests/parameters.yml.dist.sqlite +++ b/app/config/tests/parameters.yml.dist.sqlite @@ -58,12 +58,5 @@ parameters: wallabag_url: http://v2.wallabag.org wallabag_support_url: 'https://www.wallabag.org/pages/support.html' - # default user config - items_on_page: 12 - theme: material - language: en_US - from_email: no-reply@wallabag.org - rss_limit: 50 - # pocket import pocket_consumer_key: xxxxxxxx -- cgit v1.2.3