UHF-9866: Merge branch 'dev' of github.com:City-of-Helsinki/drupal-he…

…lfi-etusivu into UHF-9866
City-of-Helsinki · Nov 4, 2024 · 7bd0a56 · 7bd0a56
2 parents 7af5eb4 + 451c8d8
commit 7bd0a56
Show file tree

Hide file tree

Showing 51 changed files with 292 additions and 542 deletions.
diff --git a/.platform/schema b/.platform/schema
@@ -1 +1 @@
-9
+10
diff --git a/compose.yaml b/compose.yaml
@@ -163,7 +163,7 @@ services:
   chromium:
     # @todo Update this to newer version once minkphp supports Selenium 4.
     # @see https://github.com/minkphp/MinkSelenium2Driver/pull/372
-    image: selenium/standalone-chrome:106.0
+    image: seleniarm/standalone-chromium:106.0
     networks:
       - internal
     profiles:

diff --git a/composer.json b/composer.json
@@ -30,7 +30,6 @@
         "drupal/openapi_jsonapi": "^3.0",
         "drupal/openapi_ui_redoc": "^1.0@RC",
         "drupal/radioactivity": "^4.0",
-        "drupal/raven": "^5.0",
         "drupal/redis": "^1.5",
         "drupal/search_api": "^1.23",
         "drupal/ultimate_cron": "^2.0@alpha",

diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/block.block.eucookiecomplianceblock.yml b/conf/cmi/block.block.eucookiecomplianceblock.yml
diff --git a/conf/cmi/block.block.hdbt_subtheme_eucookiecomplianceblock.yml b/conf/cmi/block.block.hdbt_subtheme_eucookiecomplianceblock.yml
diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml
@@ -43,6 +43,7 @@ module:
   gin_toolbar: 0
   hal: 0
   hdbt_admin_tools: 0
+  hdbt_cookie_banner: 0
   health_check: 0
   helfi_alt_lang_fallback: 0
   helfi_annif: 0
@@ -53,7 +54,6 @@ module:
   helfi_etusivu: 0
   helfi_etusivu_config: 0
   helfi_etusivu_entities: 0
-  helfi_eu_cookie_compliance: 0
   helfi_global_navigation: 0
   helfi_image_styles: 0
   helfi_media: 0
@@ -189,7 +189,6 @@ module:
   paragraphs: 11
   publication_date: 99
   minimal: 1000
-  eu_cookie_compliance: 1001
 theme:
   claro: 0
   stable9: 0

diff --git a/conf/cmi/eu_cookie_compliance.cookie_category.chat.yml b/conf/cmi/eu_cookie_compliance.cookie_category.chat.yml
diff --git a/conf/cmi/eu_cookie_compliance.cookie_category.essential.yml b/conf/cmi/eu_cookie_compliance.cookie_category.essential.yml
diff --git a/conf/cmi/eu_cookie_compliance.cookie_category.preference.yml b/conf/cmi/eu_cookie_compliance.cookie_category.preference.yml
diff --git a/conf/cmi/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/eu_cookie_compliance.cookie_category.statistics.yml