diff options
| author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-02-04 17:45:50 +0100 |
|---|---|---|
| committer | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-02-04 17:45:50 +0100 |
| commit | 2ab20ed6f9abe94fc5405740ea1598efc3ff1c16 (patch) | |
| tree | fe5464d602ffae868506eea3c72a6af7d9573025 /app/config | |
| parent | eb3e3969a2d09767a1eb3042b74ce1f8736e3b4d (diff) | |
| parent | bc358c918005159afe3f7c350c0c0c29f4054e4c (diff) | |
| download | wallabag-2ab20ed6f9abe94fc5405740ea1598efc3ff1c16.tar.gz wallabag-2ab20ed6f9abe94fc5405740ea1598efc3ff1c16.tar.zst wallabag-2ab20ed6f9abe94fc5405740ea1598efc3ff1c16.zip | |
Merge pull request #1644 from wallabag/v2-enable-confirmation-parameter
Fix #1622: parameter for FosUser confirmation
Diffstat (limited to 'app/config')
| -rw-r--r-- | app/config/config.yml | 2 | ||||
| -rw-r--r-- | app/config/parameters.yml.dist | 3 | ||||
| -rw-r--r-- | app/config/tests/parameters.yml.dist.mysql | 3 | ||||
| -rw-r--r-- | app/config/tests/parameters.yml.dist.pgsql | 3 | ||||
| -rw-r--r-- | app/config/tests/parameters.yml.dist.sqlite | 3 |
5 files changed, 13 insertions, 1 deletions
diff --git a/app/config/config.yml b/app/config/config.yml index dc6bccee..7dac4d3b 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
| @@ -168,7 +168,7 @@ fos_user: | |||
| 168 | user_class: Wallabag\UserBundle\Entity\User | 168 | user_class: Wallabag\UserBundle\Entity\User |
| 169 | registration: | 169 | registration: |
| 170 | confirmation: | 170 | confirmation: |
| 171 | enabled: true | 171 | enabled: %fosuser_confirmation% |
| 172 | from_email: | 172 | from_email: |
| 173 | address: %from_email% | 173 | address: %from_email% |
| 174 | sender_name: wallabag | 174 | sender_name: wallabag |
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 79654e9e..7c7413fb 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist | |||
| @@ -41,4 +41,7 @@ parameters: | |||
| 41 | twofactor_auth: true | 41 | twofactor_auth: true |
| 42 | twofactor_sender: no-reply@wallabag.org | 42 | twofactor_sender: no-reply@wallabag.org |
| 43 | 43 | ||
| 44 | # fosuser stuff | ||
| 45 | fosuser_confirmation: true | ||
| 46 | |||
| 44 | from_email: no-reply@wallabag.org | 47 | from_email: no-reply@wallabag.org |
diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql index dceb5dea..1951f021 100644 --- a/app/config/tests/parameters.yml.dist.mysql +++ b/app/config/tests/parameters.yml.dist.mysql | |||
| @@ -31,4 +31,7 @@ parameters: | |||
| 31 | twofactor_auth: true | 31 | twofactor_auth: true |
| 32 | twofactor_sender: no-reply@wallabag.org | 32 | twofactor_sender: no-reply@wallabag.org |
| 33 | 33 | ||
| 34 | # fosuser stuff | ||
| 35 | fosuser_confirmation: true | ||
| 36 | |||
| 34 | from_email: no-reply@wallabag.org | 37 | from_email: no-reply@wallabag.org |
diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql index e07db610..36ad6cde 100644 --- a/app/config/tests/parameters.yml.dist.pgsql +++ b/app/config/tests/parameters.yml.dist.pgsql | |||
| @@ -31,4 +31,7 @@ parameters: | |||
| 31 | twofactor_auth: true | 31 | twofactor_auth: true |
| 32 | twofactor_sender: no-reply@wallabag.org | 32 | twofactor_sender: no-reply@wallabag.org |
| 33 | 33 | ||
| 34 | # fosuser stuff | ||
| 35 | fosuser_confirmation: true | ||
| 36 | |||
| 34 | from_email: no-reply@wallabag.org | 37 | from_email: no-reply@wallabag.org |
diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite index 01589d28..6564014a 100644 --- a/app/config/tests/parameters.yml.dist.sqlite +++ b/app/config/tests/parameters.yml.dist.sqlite | |||
| @@ -31,4 +31,7 @@ parameters: | |||
| 31 | twofactor_auth: true | 31 | twofactor_auth: true |
| 32 | twofactor_sender: no-reply@wallabag.org | 32 | twofactor_sender: no-reply@wallabag.org |
| 33 | 33 | ||
| 34 | # fosuser stuff | ||
| 35 | fosuser_confirmation: true | ||
| 36 | |||
| 34 | from_email: no-reply@wallabag.org | 37 | from_email: no-reply@wallabag.org |