Merge remote-tracking branch 'remotes/dev/5.0' into 5.0

oroinc · May 22, 2023 · 3afb7c1 · 3afb7c1
2 parents fa659df + 34229a3
commit 3afb7c1
Show file tree

Hide file tree

Showing 5 changed files with 2,360 additions and 1,795 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,7 +6,7 @@
 atlassian-ide-plugin.xml
 /composer.phar
 composer.lock
-behat.yml
+/behat.yml
 /var/*
 !var/cache/
 /var/cache/*

diff --git a/config/config_prod.yml b/config/config_prod.yml
@@ -34,6 +34,8 @@ monolog:
             type:           deduplication
             handler:        symfony_mailer
             time:           10
+            store:          "%kernel.logs_dir%/deduplicated.log"
+
         symfony_mailer:
             type:           symfony_mailer
             email_prototype: