From f029af2c8d23c6fa2af0add43c2ab9e79e0ff024 Mon Sep 17 00:00:00 2001 From: Tero Virtanen <105207219+terovirtanen@users.noreply.github.com> Date: Fri, 23 Aug 2024 09:49:23 +0300 Subject: [PATCH 1/3] Update Azure Devops pipelines (#913) --- azure-pipelines-devtest.yml | 48 --------------------------------- azure-pipelines-prod.yml | 47 -------------------------------- azure-pipelines-staging.yml | 47 -------------------------------- pipelines/drupal-production.yml | 37 +++++++++++++++++++++++++ pipelines/drupal-staging.yml | 47 ++++++++++++++++++++++++++++++++ pipelines/drupal-test.yml | 47 ++++++++++++++++++++++++++++++++ 6 files changed, 131 insertions(+), 142 deletions(-) delete mode 100644 azure-pipelines-devtest.yml delete mode 100644 azure-pipelines-prod.yml delete mode 100644 azure-pipelines-staging.yml create mode 100644 pipelines/drupal-production.yml create mode 100644 pipelines/drupal-staging.yml create mode 100644 pipelines/drupal-test.yml diff --git a/azure-pipelines-devtest.yml b/azure-pipelines-devtest.yml deleted file mode 100644 index 182b4e4e9..000000000 --- a/azure-pipelines-devtest.yml +++ /dev/null @@ -1,48 +0,0 @@ -# Continuous integration (CI) triggers cause a pipeline to run whenever you push -# an update to the specified branches or you push specified tags. -trigger: - batch: true - branches: - include: - - dev - paths: - exclude: - - README.md - -# Pull request (PR) triggers cause a pipeline to run whenever a pull request is -# opened with one of the specified target branches, or when updates are made to -# such a pull request. -# -# GitHub creates a new ref when a pull request is created. The ref points to a -# merge commit, which is the merged code between the source and target branches -# of the pull request. -# -# Opt out of pull request validation -pr: none - -# By default, use self-hosted agents -pool: Default - -# Image tag name for Fuse projects -#parameters: -#- name: imagetag -# displayName: Image tag to be built and/or deployed -# type: string -# default: latest - -resources: - repositories: - # Azure DevOps repository - - repository: liikenne-pipelines - type: git - # Azure DevOps project/repository - name: liikenne/liikenne-pipelines - -extends: - # Filename in Azure DevOps Repository (note possible -ui or -api) - # Django example: azure-pipelines-PROJECTNAME-api-master.yml - # Drupal example: azure-pipelines-drupal-master.yml - template: azure-pipelines-drupal-devtest.yml@liikenne-pipelines - # Image tag name for Fuse projects - #parameters: - #imagetag: ${{ parameters.imagetag }} diff --git a/azure-pipelines-prod.yml b/azure-pipelines-prod.yml deleted file mode 100644 index 8940f7c44..000000000 --- a/azure-pipelines-prod.yml +++ /dev/null @@ -1,47 +0,0 @@ -# Continuous integration (CI) triggers cause a pipeline to run whenever you push -# an update to the specified branches or you push specified tags. -trigger: none -# batch: true -# branches: -# include: -# - main -# paths: -# exclude: -# - README.md - -# Pull request (PR) triggers cause a pipeline to run whenever a pull request is -# opened with one of the specified target branches, or when updates are made to -# such a pull request. -# -# GitHub creates a new ref when a pull request is created. The ref points to a -# merge commit, which is the merged code between the source and target branches -# of the pull request. -# -# Opt out of pull request validation -pr: none - -# By default, use self-hosted agents -pool: Default - -# Image tag name for Fuse projects -#parameters: -#- name: imagetag -# displayName: Image tag to be built and/or deployed -# type: string -# default: latest - -resources: - repositories: - # Azure DevOps repository - - repository: liikenne-pipelines - type: git - # Azure DevOps project/repository - name: liikenne/liikenne-pipelines - -extends: - # Filename in Azure DevOps Repository (note possible -ui or -api) - # Django example: azure-pipelines-PROJECTNAME-api-release.yml - # Drupal example: azure-pipelines-drupal-release.yml - template: azure-pipelines-drupal-prod.yml@liikenne-pipelines - #parameters: - #imagetag: ${{ parameters.imagetag }} diff --git a/azure-pipelines-staging.yml b/azure-pipelines-staging.yml deleted file mode 100644 index e4e8be4d0..000000000 --- a/azure-pipelines-staging.yml +++ /dev/null @@ -1,47 +0,0 @@ -# Continuous integration (CI) triggers cause a pipeline to run whenever you push -# an update to the specified branches or you push specified tags. -trigger: - batch: true - branches: - include: - - main - paths: - exclude: - - README.md - -# Pull request (PR) triggers cause a pipeline to run whenever a pull request is -# opened with one of the specified target branches, or when updates are made to -# such a pull request. -# -# GitHub creates a new ref when a pull request is created. The ref points to a -# merge commit, which is the merged code between the source and target branches -# of the pull request. -# -# Opt out of pull request validation -pr: none - -# By default, use self-hosted agents -pool: Default - -# Image tag name for Fuse projects -#parameters: -#- name: imagetag -# displayName: Image tag to be built and/or deployed -# type: string -# default: latest - -resources: - repositories: - # Azure DevOps repository - - repository: liikenne-pipelines - type: git - # Azure DevOps project/repository - name: liikenne/liikenne-pipelines - -extends: - # Filename in Azure DevOps Repository (note possible -ui or -api) - # Django example: azure-pipelines-PROJECTNAME-api-release.yml - # Drupal example: azure-pipelines-drupal-release.yml - template: azure-pipelines-drupal-staging.yml@liikenne-pipelines - #parameters: - #imagetag: ${{ parameters.imagetag }} diff --git a/pipelines/drupal-production.yml b/pipelines/drupal-production.yml new file mode 100644 index 000000000..ff8e15b68 --- /dev/null +++ b/pipelines/drupal-production.yml @@ -0,0 +1,37 @@ +# Continuous integration (CI) triggers cause a pipeline to run whenever you push +# an update to the specified branches or you push specified tags. +trigger: none + +# Pull request (PR) triggers cause a pipeline to run whenever a pull request is +# opened with one of the specified target branches, or when updates are made to +# such a pull request. +# +# GitHub creates a new ref when a pull request is created. The ref points to a +# merge commit, which is the merged code between the source and target branches +# of the pull request. +# +# Opt out of pull request validation +pr: none + +# By default, use self-hosted agents +pool: Default + +resources: + repositories: + # Azure DevOps repository + - repository: liikenne-pipelines + type: git + # Azure DevOps project/repository + name: liikenne/liikenne-pipelines + +extends: + # Filename in Azure DevOps Repository + template: components/drupal/pipelines/drupal-production.yml@liikenne-pipelines + # parameters: + # Application build arguments and config map values as key value pairs. + # Does not contain all buildArguments or configMap values, the rest located in liikenne-pipelines + # The values here will override the values defined in the liikenne-pipelines repository + # buildArgs: + # DEBUG: 1 + # configMap: # pod environment variables + # DEBUG: 1 diff --git a/pipelines/drupal-staging.yml b/pipelines/drupal-staging.yml new file mode 100644 index 000000000..d9f065893 --- /dev/null +++ b/pipelines/drupal-staging.yml @@ -0,0 +1,47 @@ +# Continuous integration (CI) triggers cause a pipeline to run whenever you push +# an update to the specified branches or you push specified tags. +trigger: + batch: true + branches: + include: + - main + paths: + exclude: + - '*.md' + - '.github/' + - 'pipelines/drupal-production.yml' + - 'pipelines/drupal-test.yml' + +# Pull request (PR) triggers cause a pipeline to run whenever a pull request is +# opened with one of the specified target branches, or when updates are made to +# such a pull request. +# +# GitHub creates a new ref when a pull request is created. The ref points to a +# merge commit, which is the merged code between the source and target branches +# of the pull request. +# +# Opt out of pull request validation +pr: none + +# By default, use self-hosted agents +pool: Default + +resources: + repositories: + # Azure DevOps repository + - repository: liikenne-pipelines + type: git + # Azure DevOps project/repository + name: liikenne/liikenne-pipelines + +extends: + # Filename in Azure DevOps Repository + template: components/drupal/pipelines/drupal-staging.yml@liikenne-pipelines + # parameters: + # Application build arguments and config map values as key value pairs. + # Does not contain all buildArguments or configMap values, the rest located in liikenne-pipelines + # The values here will override the values defined in the liikenne-pipelines repository + # buildArgs: + # DEBUG: 1 + # configMap: # pod environment variables + # DEBUG: 1 diff --git a/pipelines/drupal-test.yml b/pipelines/drupal-test.yml new file mode 100644 index 000000000..1502aa984 --- /dev/null +++ b/pipelines/drupal-test.yml @@ -0,0 +1,47 @@ +# Continuous integration (CI) triggers cause a pipeline to run whenever you push +# an update to the specified branches or you push specified tags. +trigger: + batch: true + branches: + include: + - dev + paths: + exclude: + - '*.md' + - '.github/' + - 'pipelines/drupal-production.yml' + - 'pipelines/drupal-staging.yml' + +# Pull request (PR) triggers cause a pipeline to run whenever a pull request is +# opened with one of the specified target branches, or when updates are made to +# such a pull request. +# +# GitHub creates a new ref when a pull request is created. The ref points to a +# merge commit, which is the merged code between the source and target branches +# of the pull request. +# +# Opt out of pull request validation +pr: none + +# By default, use self-hosted agents +pool: Default + +resources: + repositories: + # Azure DevOps repository + - repository: liikenne-pipelines + type: git + # Azure DevOps project/repository + name: liikenne/liikenne-pipelines + +extends: + # Filename in Azure DevOps Repository + template: components/drupal/pipelines/drupal-test.yml@liikenne-pipelines + # parameters: + # Application build arguments and config map values as key value pairs. + # Does not contain all buildArguments or configMap values, the rest located in liikenne-pipelines + # The values here will override the values defined in the liikenne-pipelines repository + # buildArgs: + # DEBUG: 1 + # configMap: # pod environment variables + # DEBUG: 1 From 24dfa904fdccf6733f69e935ee9d64554ace0c85 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Sun, 25 Aug 2024 12:05:34 +0000 Subject: [PATCH 2/3] Updated node modules based on npm audit fix --- .../custom/hdbt_subtheme/package-lock.json | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/public/themes/custom/hdbt_subtheme/package-lock.json b/public/themes/custom/hdbt_subtheme/package-lock.json index 2d32897a5..a4e506682 100644 --- a/public/themes/custom/hdbt_subtheme/package-lock.json +++ b/public/themes/custom/hdbt_subtheme/package-lock.json @@ -6713,11 +6713,12 @@ } }, "node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", + "license": "MIT", "dependencies": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" }, "engines": { @@ -15565,11 +15566,11 @@ "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==" }, "micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "requires": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" } }, From f76d4fa1b121012bf22215bc2d6bae810045225c Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Tue, 27 Aug 2024 11:13:06 +0000 Subject: [PATCH 3/3] Update configuration --- composer.lock | 155 +++++++++++++++--------------- conf/cmi/core.extension.yml | 1 + public/sites/default/settings.php | 1 + 3 files changed, 80 insertions(+), 77 deletions(-) diff --git a/composer.lock b/composer.lock index d8d076852..955839ef6 100644 --- a/composer.lock +++ b/composer.lock @@ -2677,7 +2677,7 @@ "homepage": "https://www.drupal.org/user/1852732" }, { - "name": "Berdir", + "name": "berdir", "homepage": "https://www.drupal.org/user/214652" }, { @@ -2693,7 +2693,7 @@ "homepage": "https://www.drupal.org/user/395439" }, { - "name": "Sam152", + "name": "sam152", "homepage": "https://www.drupal.org/user/1485048" } ], @@ -2858,7 +2858,7 @@ "homepage": "https://www.drupal.org/user/430714" }, { - "name": "Greg Boggs", + "name": "greg boggs", "homepage": "https://www.drupal.org/user/153069" }, { @@ -2870,11 +2870,11 @@ "homepage": "https://www.drupal.org/user/717290" }, { - "name": "Neslee Canil Pinto", + "name": "neslee canil pinto", "homepage": "https://www.drupal.org/user/3580850" }, { - "name": "NickDickinsonWilde", + "name": "nickdickinsonwilde", "homepage": "https://www.drupal.org/user/3094661" }, { @@ -3344,20 +3344,20 @@ }, { "name": "drupal/entity_usage", - "version": "2.0.0-beta13", + "version": "2.0.0-beta14", "source": { "type": "git", "url": "https://git.drupalcode.org/project/entity_usage.git", - "reference": "8.x-2.0-beta13" + "reference": "8.x-2.0-beta14" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/entity_usage-8.x-2.0-beta13.zip", - "reference": "8.x-2.0-beta13", - "shasum": "3b07a629ed6c94ee23656556b0d1a1c7ba58a77f" + "url": "https://ftp.drupal.org/files/projects/entity_usage-8.x-2.0-beta14.zip", + "reference": "8.x-2.0-beta14", + "shasum": "68124ea440273a8f4e40bc7d07421c8a230c287b" }, "require": { - "drupal/core": "^10.1 || ^11" + "drupal/core": "^10.2 || ^11" }, "require-dev": { "drupal/block_field": "~1.0", @@ -3374,8 +3374,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.0-beta13", - "datestamp": "1721834455", + "version": "8.x-2.0-beta14", + "datestamp": "1724498300", "security-coverage": { "status": "not-covered", "message": "Beta releases are not covered by Drupal security advisories." @@ -4117,16 +4117,16 @@ }, { "name": "drupal/hdbt", - "version": "6.6.4", + "version": "6.6.8", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "d8e011aa97b4449d3c7eaca723fff9d2111c6db4" + "reference": "aae8641b58d16cf0b396f8a34b8be40403e495a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/d8e011aa97b4449d3c7eaca723fff9d2111c6db4", - "reference": "d8e011aa97b4449d3c7eaca723fff9d2111c6db4", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/aae8641b58d16cf0b396f8a34b8be40403e495a6", + "reference": "aae8641b58d16cf0b396f8a34b8be40403e495a6", "shasum": "" }, "require": { @@ -4144,10 +4144,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.6.4", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.6.8", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-08-15T08:46:48+00:00" + "time": "2024-08-27T11:08:04+00:00" }, { "name": "drupal/hdbt_admin", @@ -4445,16 +4445,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.4.10", + "version": "4.4.13", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "97338d748ace88329505d3a79eb3e03d98ef648f" + "reference": "c609a3f7abd306e1ae11c6ddb422f34e421f0748" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/97338d748ace88329505d3a79eb3e03d98ef648f", - "reference": "97338d748ace88329505d3a79eb3e03d98ef648f", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/c609a3f7abd306e1ae11c6ddb422f34e421f0748", + "reference": "c609a3f7abd306e1ae11c6ddb422f34e421f0748", "shasum": "" }, "require": { @@ -4525,6 +4525,7 @@ "drupal/core": "<10.3", "drupal/core-composer-scaffold": "<10.3", "drupal/ctools": "<3.11 || ^4.0.1", + "drupal/default_content": ">2.0.0-alpha2", "drupal/gin_toolbar": ">1.0.0-rc6", "drupal/helfi_media_map": "*", "drupal/stage_file_proxy": "<2.1.5", @@ -4571,10 +4572,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.4.10", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.4.13", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-08-16T08:50:18+00:00" + "time": "2024-08-27T10:45:17+00:00" }, { "name": "drupal/helfi_proxy", @@ -5176,26 +5177,26 @@ }, { "name": "drupal/media_entity_file_replace", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/media_entity_file_replace.git", - "reference": "8.x-1.2" + "reference": "8.x-1.3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/media_entity_file_replace-8.x-1.2.zip", - "reference": "8.x-1.2", - "shasum": "e5e1aa2519c3e3f65e8a8291c324bc527f649147" + "url": "https://ftp.drupal.org/files/projects/media_entity_file_replace-8.x-1.3.zip", + "reference": "8.x-1.3", + "shasum": "cfc0d500aba8b6ade547c9a17173f9a89fde02d0" }, "require": { - "drupal/core": "^9 || ^10" + "drupal/core": "^10 || ^11" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.2", - "datestamp": "1701092779", + "version": "8.x-1.3", + "datestamp": "1724336085", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5277,26 +5278,26 @@ }, { "name": "drupal/menu_link_attributes", - "version": "1.3.0", + "version": "1.4.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/menu_link_attributes.git", - "reference": "8.x-1.3" + "reference": "8.x-1.4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/menu_link_attributes-8.x-1.3.zip", - "reference": "8.x-1.3", - "shasum": "431c7954cc614a1b9677173f0209f1df15592503" + "url": "https://ftp.drupal.org/files/projects/menu_link_attributes-8.x-1.4.zip", + "reference": "8.x-1.4", + "shasum": "a679a5c53c94e3c992483ce3ea782950f4f7e5b3" }, "require": { - "drupal/core": "^8 || ^9 || ^10" + "drupal/core": "^8 || ^9 || ^10 || ^11" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.3", - "datestamp": "1671026425", + "version": "8.x-1.4", + "datestamp": "1724060900", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5313,7 +5314,7 @@ "homepage": "https://www.drupal.org/user/291091" }, { - "name": "Grevil", + "name": "grevil", "homepage": "https://www.drupal.org/user/3668491" }, { @@ -5470,26 +5471,26 @@ }, { "name": "drupal/oembed_providers", - "version": "2.1.2", + "version": "2.2.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/oembed_providers.git", - "reference": "2.1.2" + "reference": "2.2.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/oembed_providers-2.1.2.zip", - "reference": "2.1.2", - "shasum": "ad125c7e55555499f001755c365f96edce1d6343" + "url": "https://ftp.drupal.org/files/projects/oembed_providers-2.2.0.zip", + "reference": "2.2.0", + "shasum": "318bafadd5e9b74a593f08e252dc5ea6dec98cd2" }, "require": { - "drupal/core": "^9.0|^10.0" + "drupal/core": "^10|^11" }, "type": "drupal-module", "extra": { "drupal": { - "version": "2.1.2", - "datestamp": "1692724351", + "version": "2.2.0", + "datestamp": "1723853165", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -7284,20 +7285,20 @@ }, { "name": "drupal/view_unpublished", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/view_unpublished.git", - "reference": "8.x-1.2" + "reference": "8.x-1.3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/view_unpublished-8.x-1.2.zip", - "reference": "8.x-1.2", - "shasum": "14374dd56d841270207e21974c7b7cf8aa1804f7" + "url": "https://ftp.drupal.org/files/projects/view_unpublished-8.x-1.3.zip", + "reference": "8.x-1.3", + "shasum": "7dd4411c53866585ac6319d147ab11d214d55877" }, "require": { - "drupal/core": "^9.4 || ^10" + "drupal/core": "^9.4 || ^10 || ^11" }, "require-dev": { "drupal/coder": "^8.3.18", @@ -7306,8 +7307,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.2", - "datestamp": "1709383642", + "version": "8.x-1.3", + "datestamp": "1724503131", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -7383,7 +7384,7 @@ "homepage": "https://www.drupal.org/u/graber" }, { - "name": "Graber", + "name": "graber", "homepage": "https://www.drupal.org/user/1599440" }, { @@ -7466,26 +7467,26 @@ }, { "name": "drupal/views_infinite_scroll", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://git.drupalcode.org/project/views_infinite_scroll.git", - "reference": "2.0.2" + "reference": "2.0.3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/views_infinite_scroll-2.0.2.zip", - "reference": "2.0.2", - "shasum": "8b2b935d1e5d94d7ad068d099512d3b915efb41f" + "url": "https://ftp.drupal.org/files/projects/views_infinite_scroll-2.0.3.zip", + "reference": "2.0.3", + "shasum": "3c56969f71256300226118a0f35bad66ab41306c" }, "require": { - "drupal/core": "^9.2 || ^10" + "drupal/core": "^10.1 || ^11" }, "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.2", - "datestamp": "1689001933", + "version": "2.0.3", + "datestamp": "1724335951", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -7498,11 +7499,11 @@ ], "authors": [ { - "name": "Anybody", + "name": "anybody", "homepage": "https://www.drupal.org/user/291091" }, { - "name": "Grevil", + "name": "grevil", "homepage": "https://www.drupal.org/user/3668491" }, { @@ -7510,7 +7511,7 @@ "homepage": "https://www.drupal.org/user/123612" }, { - "name": "Neslee Canil Pinto", + "name": "neslee canil pinto", "homepage": "https://www.drupal.org/user/3580850" }, { @@ -7518,7 +7519,7 @@ "homepage": "https://www.drupal.org/user/143827" }, { - "name": "Sam152", + "name": "sam152", "homepage": "https://www.drupal.org/user/1485048" }, { @@ -10740,16 +10741,16 @@ }, { "name": "psr/log", - "version": "3.0.0", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001" + "reference": "79dff0b268932c640297f5208d6298f71855c03e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001", + "url": "https://api.github.com/repos/php-fig/log/zipball/79dff0b268932c640297f5208d6298f71855c03e", + "reference": "79dff0b268932c640297f5208d6298f71855c03e", "shasum": "" }, "require": { @@ -10784,9 +10785,9 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/3.0.0" + "source": "https://github.com/php-fig/log/tree/3.0.1" }, - "time": "2021-07-14T16:46:02+00:00" + "time": "2024-08-21T13:31:24+00:00" }, { "name": "psy/psysh", diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml index 7268f01f7..d5a5972d9 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -91,6 +91,7 @@ module: helfi_tpr_config: 0 helfi_tunnistamo: 0 helfi_user_roles: 0 + helfi_users: 0 help: 0 image: 0 image_style_quality: 0 diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php index 9e6f7a6b2..9813b60af 100755 --- a/public/sites/default/settings.php +++ b/public/sites/default/settings.php @@ -350,6 +350,7 @@ function drupal_get_env(string|array $variables) : mixed { 'DRUPAL_DB_NAME', 'DRUPAL_DB_PASS', 'DRUPAL_DB_HOST', + 'TFA_ENCRYPTION_KEY', ], 'additionalFiles' => [], ];