Merge branch 'enhancement/sulu-update-225' into 'master'

Adjust project to match sulu/skeleton and update to Sulu 2.2.5 See merge request webapps/sulu-demo!104
sulu · Feb 26, 2021 · 0a255fb · 0a255fb
2 parents 89bc9d4 + cddb285
commit 0a255fb
Show file tree

Hide file tree

Showing 36 changed files with 3,034 additions and 3,109 deletions.
diff --git a/.env b/.env
@@ -43,11 +43,17 @@ SULU_ADMIN_EMAIL=
 ###> doctrine/phpcr-bundle ###
 ###< doctrine/phpcr-bundle ###
 
+###> symfony/lock ###
+# Choose one of the stores below
+# postgresql+advisory://db_user:db_password@localhost/db_name
+LOCK_DSN=semaphore
+###< symfony/lock ###
+
 ###> sentry/sentry-symfony ###
 SENTRY_DSN=
 ###< sentry/sentry-symfony ###
 
-# See https://docs.sulu.io/en/2.0/cookbook/external-media-storage.html
+# See https://docs.sulu.io/en/2.2/cookbook/external-media-storage.html
 MEDIA_STORAGE=local
 MEDIA_SAVE_IMAGE_LOCAL=true
 S3_KEY=

diff --git a/assets/admin/package-lock.json b/assets/admin/package-lock.json
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
         "sentry/sentry-symfony": "^3.0",
         "sulu/article-bundle": "^2.1",
         "sulu/automation-bundle": "^2.0@dev",
-        "sulu/sulu": "~2.2.3",
+        "sulu/sulu": "~2.2.5",
         "sulu/web-twig": "^2.1",
         "symfony/config": "^5.1",
         "symfony/dotenv": "^5.1",