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

oroinc · May 22, 2023 · 81bfde7 · 81bfde7
2 parents 85601b9 + 031bccf
commit 81bfde7
Show file tree

Hide file tree

Showing 5 changed files with 2,371 additions and 1,806 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,7 @@
 /node_modules
 /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
@@ -45,6 +45,8 @@ monolog:
             type:           deduplication
             handler:        symfony_mailer
             time:           10
+            store:          "%kernel.logs_dir%/deduplicated.log"
+
         symfony_mailer:
             type:           symfony_mailer
             email_prototype: