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

SU-HSDO · Jan 14, 2025 · 9eb044f · 9eb044f
2 parents e4a1bfa + beb82ac
commit 9eb044f
Show file tree

Hide file tree

Showing 27 changed files with 760 additions and 607 deletions.
diff --git a/composer.json b/composer.json
@@ -57,7 +57,7 @@
         "drupal/auto_entitylabel": "^3.0@beta",
         "drupal/better_exposed_filters": "^7.0",
         "drupal/better_normalizers": "^2.0",
-        "drupal/block_class": "^2.0",
+        "drupal/block_class": "^4.0",
         "drupal/block_content_permissions": "^1.10",
         "drupal/cancel_button": "^1.1",
         "drupal/chosen": "^4.0",
@@ -230,8 +230,8 @@
     "extra": {
         "enable-patching": true,
         "patches": {
-            "drupal/conditional_fields": {
-                "https://www.drupal.org/project/conditional_fields/issues/2902164": "https://www.drupal.org/files/issues/2023-09-28/2902164-149.patch"
+            "drupal/block_class": {
+                "Click JavaScript to close details causes modals to scroll unnecessarily https://www.drupal.org/project/block_class/issues/3497768": "patches/contrib/block_class/60.patch"
             },
             "drupal/config_ignore": {
                 "https://www.drupal.org/project/config_ignore/issues/2857247": "https://www.drupal.org/files/issues/2020-01-11/support-for-export-2857247-44.patch",
@@ -254,9 +254,6 @@
                 "https://www.drupal.org/project/field_group/issues/2969051": "https://www.drupal.org/files/issues/2024-09-13/2969051-166.patch",
                 "https://www.drupal.org/project/field_group/issues/2787179": "https://www.drupal.org/files/issues/2024-08-05/2787179-highlight-html5-validation-101.patch"
             },
-            "drupal/google_analytics": {
-                "https://www.drupal.org/project/google_analytics/issues/3373921": "https://www.drupal.org/files/issues/2023-08-07/google-analytics-issues-3373921-cannot-install-from-existing-config-11.patch"
-            },
             "drupal/hook_event_dispatcher": {
                 "https://www.drupal.org/project/hook_event_dispatcher/issues/3354751": "https://git.drupalcode.org/project/hook_event_dispatcher/-/merge_requests/133.patch"
             },
@@ -290,6 +287,9 @@
                 "https://www.drupal.org/project/redirect/issues/3057250": "https://www.drupal.org/files/issues/2024-08-11/redirect--2024-08-11--3057250-79.patch",
                 "https://www.drupal.org/project/redirect/issues/3018897": "https://www.drupal.org/files/issues/2024-08-12/redirect-3018897-28.patch"
             },
+            "drupal/shield": {
+                "https://www.drupal.org/project/shield/issues/3479117": "patches/shield-undefined_array_key_explode-3479117.patch"
+            },
             "drupal/ui_patterns": {
                 "Ui Patterns Views Preview": "patches/contrib/ui_patterns_views-preview.patch"
             },