From f556527bb99c148c682aaf247aaccd4c808692a2 Mon Sep 17 00:00:00 2001 From: tuutti Date: Thu, 10 Oct 2024 11:23:37 +0300 Subject: [PATCH 1/2] UHF-10248: Removed unused eu_cookie_compliance patch --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index bfb816c01..3aff60e0f 100644 --- a/composer.json +++ b/composer.json @@ -99,8 +99,7 @@ "https://www.drupal.org/project/default_content/issues/2640734#comment-14638943": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/main/patches/default_content_2.0.0-alpha2-2640734_manual_imports-e164a354.patch" }, "drupal/eu_cookie_compliance": { - "[#UHF-885] Helfi-specific customizations to EU Cookie Compliance": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/923b35f699820b544397a35b7696570e101cd02c/patches/eu_cookie_compliance_block_8.x-1.24.patch", - "[#UHF-8720] Missing config schema for dependencies (https://www.drupal.org/i/3330024)": "https://www.drupal.org/files/issues/2022-12-28/config_dependencies_schema-3330024-2.patch" + "[#UHF-885] Helfi-specific customizations to EU Cookie Compliance": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/923b35f699820b544397a35b7696570e101cd02c/patches/eu_cookie_compliance_block_8.x-1.24.patch" }, "drupal/diff": { "Revision overview form problem (https://www.drupal.org/i/3390329)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/05989cc82b2817de994ad4e9289ccb777f71f23f/patches/diff_8.x_1.3_revision_overview_form.patch" From 4e456b29170c85da43cded166f58d730426426f8 Mon Sep 17 00:00:00 2001 From: tuutti Date: Thu, 10 Oct 2024 11:35:01 +0300 Subject: [PATCH 2/2] UHF-10248: Lock eu_cookie_compliance to 1.24 version since it will be replaced soon(tm) --- composer.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 3aff60e0f..66d81db24 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "drupal/elasticsearch_connector": "^7.0@alpha", "drupal/entity_browser": "^2.5", "drupal/entity_usage": "^2.0@beta", - "drupal/eu_cookie_compliance": "^1.24", + "drupal/eu_cookie_compliance": "1.24", "drupal/external_entities": "^2.0@beta", "drupal/field_group": "^3.1", "drupal/focal_point": "^2.0", @@ -99,7 +99,8 @@ "https://www.drupal.org/project/default_content/issues/2640734#comment-14638943": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/main/patches/default_content_2.0.0-alpha2-2640734_manual_imports-e164a354.patch" }, "drupal/eu_cookie_compliance": { - "[#UHF-885] Helfi-specific customizations to EU Cookie Compliance": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/923b35f699820b544397a35b7696570e101cd02c/patches/eu_cookie_compliance_block_8.x-1.24.patch" + "[#UHF-885] Helfi-specific customizations to EU Cookie Compliance": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/923b35f699820b544397a35b7696570e101cd02c/patches/eu_cookie_compliance_block_8.x-1.24.patch", + "[#UHF-8720] Missing config schema for dependencies (https://www.drupal.org/i/3330024)": "https://www.drupal.org/files/issues/2022-12-28/config_dependencies_schema-3330024-2.patch" }, "drupal/diff": { "Revision overview form problem (https://www.drupal.org/i/3390329)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/05989cc82b2817de994ad4e9289ccb777f71f23f/patches/diff_8.x_1.3_revision_overview_form.patch"