Merge branch '11.6.1-release' into SHS-5907--easily-set-view

SU-HSDO · Nov 21, 2024 · b694932 · b694932
2 parents a1c98d5 + 840e36a
commit b694932
Show file tree

Hide file tree

Showing 5 changed files with 290 additions and 111 deletions.
diff --git a/composer.json b/composer.json
@@ -252,7 +252,8 @@
                 "Allow hs group blocks in layout_builder": "patches/layout_builder-allow-hs-blocks.patch",
                 "Allow media items to be edited in a modal when using the field widget https://www.drupal.org/project/drupal/issues/2985168": "https://www.drupal.org/files/issues/2023-12-18/2985168-172.patch",
                 "Cannot read properties of undefined (reading 'settings') with dialog.position.js https://www.drupal.org/project/drupal/issues/3356667": "patches/core/core-mr-8892.patch",
-                "https://www.drupal.org/project/drupal/issues/3207813: ModuleHandler skips all hook implementations when invoked before the module files have been loaded": "patches/core/core-mr-6976.patch"
+                "https://www.drupal.org/project/drupal/issues/3207813: ModuleHandler skips all hook implementations when invoked before the module files have been loaded": "patches/core/core-mr-6976.patch",
+                "https://www.drupal.org/project/drupal/issues/3487031: Twig 13.4.2 performance degradation": "patches/core/core-mr-10177.patch"
             },
             "drupal/entity_reference_exposed_filters": {
                 "https://www.drupal.org/project/entity_reference_exposed_filters/issues/3189025": "https://www.drupal.org/files/issues/2023-10-17/entity_reference_exposed_filters-empty_target-3189025-4.patch"