aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/AppKernel.php1
-rw-r--r--app/config/config.yml2
2 files changed, 2 insertions, 1 deletions
diff --git a/app/AppKernel.php b/app/AppKernel.php
index c50783a6..b6babf1d 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -40,6 +40,7 @@ class AppKernel extends Kernel
40 new Wallabag\ImportBundle\WallabagImportBundle(), 40 new Wallabag\ImportBundle\WallabagImportBundle(),
41 new Wallabag\AnnotationBundle\WallabagAnnotationBundle(), 41 new Wallabag\AnnotationBundle\WallabagAnnotationBundle(),
42 new OldSound\RabbitMqBundle\OldSoundRabbitMqBundle(), 42 new OldSound\RabbitMqBundle\OldSoundRabbitMqBundle(),
43 new Wallabag\GroupBundle\WallabagGroupBundle(),
43 ]; 44 ];
44 45
45 if (in_array($this->getEnvironment(), ['dev', 'test'], true)) { 46 if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
diff --git a/app/config/config.yml b/app/config/config.yml
index f1d93aaa..883626fd 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -179,7 +179,7 @@ fos_user:
179 firewall_name: secured_area 179 firewall_name: secured_area
180 user_class: Wallabag\UserBundle\Entity\User 180 user_class: Wallabag\UserBundle\Entity\User
181 group: 181 group:
182 group_class: Wallabag\UserBundle\Entity\Group 182 group_class: Wallabag\GroupBundle\Entity\Group
183 registration: 183 registration:
184 confirmation: 184 confirmation:
185 enabled: "%fosuser_confirmation%" 185 enabled: "%fosuser_confirmation%"