Develop

.gitignore

@@ -73,4 +73,5 @@
 /web/libraries/*
 /docker/ssh/config
 /docker/drupal/settings.local.php
+/docker/drupal/*.settings.local.php
 *.sql

.gitlab-ci.yml

@@ -20,7 +20,7 @@ workflow:
     # Pipelines do not run when branchname starts with ^aupdt_
     - if: $CI_COMMIT_BRANCH =~ /^aupdt_/
       when: never
-    - when: always
+    - if: '$CI_COMMIT_BRANCH == "develop" || $CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "main"'
 
 stages:
   - build

composer.json

@@ -28,22 +28,21 @@
     "cweagans/composer-patches": "^1.7",
     "drupal/admin_dialogs": "^1.0",
     "drupal/admin_toolbar": "^3.2",
-    "drupal/advagg": "^6.0@alpha",
     "drupal/backup_migrate": "^5.0",
     "drupal/ckeditor5_markdown_editor": "^1.0@dev",
     "drupal/config_ignore": "^3.2",
     "drupal/config_split": "^2.0",
-    "drupal/core-composer-scaffold": "^10",
-    "drupal/core-recommended": "^10",
-    "drupal/core-vendor-hardening": "^10",
+    "drupal/core-composer-scaffold": "^11",
+    "drupal/core-recommended": "^11",
+    "drupal/core-vendor-hardening": "^11",
     "drupal/danse": "^2.3",
-    "drupal/field_encrypt": "^3.1",
-    "drupal/gin": "^3.0@alpha",
+    "drupal/field_encrypt": "^3.2",
+    "drupal/gin": "^4.0",
     "drupal/gin_login": "^2.0",
-    "drupal/gin_toolbar": "^1.0@RC",
+    "drupal/gin_toolbar": "^2.0",
     "drupal/markdown_easy": "^1.0",
     "drupal/masquerade": "^2.0@RC",
-    "drupal/matomo": "^1.23",
+    "drupal/matomo": "^2.0@alpha",
     "drupal/media_library_edit": "^3.0",
     "drupal/metatag": "^2.0",
     "drupal/nostr_content_nip23": "1.0.x-dev",
@@ -53,27 +52,28 @@
     "drupal/paragraphs": "^1.15",
     "drupal/pathauto": "^1.11",
     "drupal/push_framework": "^2.3",
-    "drupal/pwa": "^2.x-dev",
+    "drupal/pwa": "^2.1@beta",
     "drupal/raven": "^6.0",
     "drupal/redirect": "^1.9",
-    "drupal/reroute_email": "^2.2",
-    "drupal/sodium": "^2.4",
+    "drupal/refreshless": "^2.0@alpha",
+    "drupal/sodium": "^3.0",
     "drupal/swiper_formatter": "^2.0@alpha",
     "drupal/symfony_mailer": "^1.2@beta",
-    "drupal/themable_forms": "^1.0",
     "drupal/twig_tweak": "^3.2",
     "drupal/ultimate_cron": "^2.0@alpha",
+    "drupal/upgrade_status": "^4.3",
     "drupal/webp": "^1.0@RC",
-    "drush/drush": "^12.0"
+    "drush/drush": "^13.0",
+    "mglaman/composer-drupal-lenient": "^1.0"
   },
   "require-dev": {
-    "drupal/core-dev": "^10",
+    "drupal/core-dev": "^11",
     "drupal/devel": "^5.1",
-    "drupal/devel_entity_updates": "^4.1",
+    "drupal/devel_entity_updates": "^4.2",
     "drupal/security_review": "^3.0",
     "drupal/twig_xdebug": "^1.3",
-    "drupal/webprofiler": "10.1.8",
-    "palantirnet/drupal-rector": "^0.19.2"
+    "drupal/webprofiler": "^11.0",
+    "palantirnet/drupal-rector": "^0.20.3"
   },
   "conflict": {
     "drupal/drupal": "*"
@@ -85,11 +85,13 @@
     "allow-plugins": {
       "composer/installers": true,
       "cweagans/composer-patches": true,
-      "drupal/core-composer-scaffold": true,
       "dealerdirect/phpcodesniffer-composer-installer": true,
-      "phpstan/extension-installer": true,
+      "drupal/core-composer-scaffold": true,
+      "drupal/core-vendor-hardening": true,
+      "mglaman/composer-drupal-lenient": true,
       "php-http/discovery": true,
-      "drupal/core-vendor-hardening": true
+      "phpstan/extension-installer": true,
+      "tbachert/spi": true
     }
   },
   "extra": {
@@ -108,11 +110,11 @@
       "allow_list": [],
       "allow_update_indirect_with_direct": 0,
       "allow_updates_beyond_constraint": 1,
-      "always_allow_direct_dependencies": 0,
+      "always_allow_direct_dependencies": 1,
       "always_update_all": 0,
       "assignees": [],
-      "automerge": 1,
-      "automerge_security": 0,
+      "automerge": 0,
+      "automerge_security": 1,
       "blocklist": [],
       "branch_prefix": "aupdt_",
       "bundled_packages": {},
@@ -146,9 +148,15 @@
         "drupal/core": {
             "[warning] No configuration objects have been updated - https://www.drupal.org/project/drupal/issues/2957279#comment-14355237" : "https://www.drupal.org/files/issues/2022-01-03/2957279-11.patch"
         },
-        "drupal/field_encrypt": {
-            "Compatibility with Drupal 10.2: Encrypting fields not possible in the UI - https://www.drupal.org/project/field_encrypt/issues/3421958" : "https://git.drupalcode.org/project/field_encrypt/-/merge_requests/41.patch"
+        "drupal/devel_entity_updates": {
+            "#3454902 D11": "https://git.drupalcode.org/project/devel_entity_updates/-/merge_requests/5.diff"
         }
+    },
+    "patchLevel": {
+      "drupal/core": "-p2"
+    },
+    "drupal-lenient": {
+      "allowed-list": ["drupal/devel_entity_updates"]
     }
   }
 }