From 4a9ee8b14ffadb12c99cb44e4e42b5533da668d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Wed, 8 Jan 2025 14:07:58 +0200 Subject: [PATCH 1/2] UHF-10910: Updated the Gin toolbar to 2.0 version. --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index d59fc48f9..c762e6087 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "drupal/focal_point": "^2.0", "drupal/jquery_ui": "^1.6", "drupal/jquery_ui_draggable": "^2.0", - "drupal/gin_toolbar": "^1.0@rc", + "drupal/gin_toolbar": "^2.0", "drupal/hal": "^2.0", "drupal/helfi_api_base": "*", "drupal/helfi_tpr": "*", @@ -77,7 +77,6 @@ "drupal/core-composer-scaffold": "<10.4", "drupal/stage_file_proxy": "<2.1.5", "drupal/ctools": "<3.11 || ^4.0.1", - "drupal/gin_toolbar": ">1.0.0-rc6", "drupal/helfi_media_map": "*", "drupal/default_content": ">2.0.0-alpha2", "drush/drush": "<12" From 6d739ef3bf2441ba17b6ccd33c47e8cf57a2a597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Wed, 8 Jan 2025 14:13:28 +0200 Subject: [PATCH 2/2] UHF-10910: Fixed indentation in composer.json. --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index c762e6087..ba9fa9ce2 100644 --- a/composer.json +++ b/composer.json @@ -114,9 +114,9 @@ "drupal/view_unpublished": { "[#UHF-9256] Fix missing dynamic permission dependencies.": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/cbb944ae79643ba7ed895db3fac7f3b3d90ac850/patches/view_unpublished_permissions_missing_dependencies.patch" }, - "drupal/elasticsearch_connector": { + "drupal/elasticsearch_connector": { "https://drupal.org/i/3486375": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/be8a1fba1a5ea2422154caf4fb7183dfc3917599/patches/3486375.patch" - } + } } } }