Skip to content

Commit

Permalink
Merge pull request #3505 from CityOfBoston/develop
Browse files Browse the repository at this point in the history 
(stage) Updates Captcha, Drupal Maintenance
  • Loading branch information
@davidrkupton
davidrkupton authored Jun 13, 2024
2 parents dc431df + 1ab99a9 commit c20cc35
Show file tree
Hide file tree
Showing 28 changed files with 2,220 additions and 2,399 deletions.
336 changes: 303 additions & 33 deletions .github/config/slack/slackDeployEnd.yml
View file

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions .github/workflows/D10-Deploy.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,11 @@ jobs:
USE_DEV: "yes"
with:
dev: ${{ env.USE_DEV }} # download dev packages when used on dev environments
args: --prefer-dist --no-interaction --no-progress --ignore-platform-req=ext-gd --ignore-platform-req=ext-soap
args: --prefer-dist --no-interaction --no-progress # --ignore-platform-req=ext-gd --ignore-platform-req=ext-soap
php_extensions: gd soap
working_dir: candidate
version: 2.5.8
php_version: 8.3
version: "2.7.6"
php_version: "8.3"
#
# Composer drupal:scaffold
- name: Install Drupal Scaffold
Expand Down
42 changes: 20 additions & 22 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,6 @@
"type": "composer",
"url": "https://asset-packagist.org"
},
{
"type": "github",
"url": "git@github.com:CityOfBoston/contextual_range_filter.git",
"vendor-alias": "cityofboston"
},
{
"type": "package",
"package": {
Expand Down Expand Up @@ -58,13 +53,12 @@
}
],
"require": {
"cityofboston/contextual_range_filter": "dev-drupal10-compat",
"composer-plugin-api": "^2.6",
"composer/installers": "^1.6",
"cweagans/composer-patches": "^1.7",
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
"drupal/acquia_connector": "^4.0",
"drupal/acquia_purge": "^1.0",
"drupal/acquia_telemetry-acquia_telemetry": "1.0.0-alpha6",
"drupal/address": "^1.4",
"drupal/addtocal": "^3.0@beta",
"drupal/admin_toolbar": "^3.1",
Expand All @@ -73,7 +67,7 @@
"drupal/advanced_text_formatter": "^3.0@RC",
"drupal/ape": "^1.6",
"drupal/autologout": "^1.0",
"drupal/autosave_form": "1.4.0",
"drupal/autosave_form": "^1.4",
"drupal/better_exposed_filters": "^6.0",
"drupal/bg_image_formatter": "^1.1",
"drupal/chosen": "^3.0",
Expand All @@ -86,9 +80,10 @@
"drupal/config_split": "^2.0@RC",
"drupal/config_update": "^2.0@alpha",
"drupal/conflict": "2.0.0-alpha3",
"drupal/contact_storage": "1.3.0",
"drupal/contact_storage": "^1.3",
"drupal/content_access": "^2.0@RC",
"drupal/content_moderation_notifications": "^3.5",
"drupal/contextual_range_filter": "^2.0",
"drupal/core": "^10.2",
"drupal/core-composer-scaffold": "^9.1",
"drupal/ctools": "^3.0",
Expand All @@ -97,12 +92,12 @@
"drupal/date_recur_modular": "^3.0",
"drupal/diff": "^1.0",
"drupal/draggableviews": "^2.0",
"drupal/dropzonejs": "2.8.0",
"drupal/dropzonejs": "^2.10",
"drupal/dynamic_entity_reference": "^3.0",
"drupal/editor_advanced_link": "^2.0",
"drupal/editor_file": "^1.4",
"drupal/entity": "^1.0",
"drupal/entity_block": "1.1.0",
"drupal/entity_block": "^1.1",
"drupal/entity_browser": "^2.0",
"drupal/entity_browser_block": "^1",
"drupal/entity_clone": "^2.0",
Expand All @@ -119,7 +114,7 @@
"drupal/google_tag": "^1.0",
"drupal/honeypot": "^2.1",
"drupal/image_url_formatter": "^1.0",
"drupal/image_widget_crop": "2.4.0",
"drupal/image_widget_crop": "^2.4",
"drupal/imagemagick": "^3.2.0",
"drupal/inline_entity_form": "^1.0@beta",
"drupal/jquery_ui_accordion": "^2.0",
Expand All @@ -130,7 +125,7 @@
"drupal/layout_builder_restrictions": "2.19.0",
"drupal/layout_builder_st": "^1.0-alpha2",
"drupal/layout_builder_styles": "^2.0",
"drupal/layout_library": "1.0.0-beta4",
"drupal/layout_library": "^1.0@beta",
"drupal/libraries": "^4.0",
"drupal/lightning_core": "^6",
"drupal/lightning_layout": "~3.0.0",
Expand All @@ -142,8 +137,8 @@
"drupal/mailsystem": "^4.4",
"drupal/masquerade": "^2.0@RC",
"drupal/media_entity_browser": "^2.0",
"drupal/media_entity_instagram": "3.0.8",
"drupal/media_entity_twitter": "2.9.0",
"drupal/media_entity_instagram": "^3.0",
"drupal/media_entity_twitter": "^2.9",
"drupal/memcache": "^2.0",
"drupal/menu_block": "^1.5",
"drupal/metatag": "^1",
Expand All @@ -155,7 +150,7 @@
"drupal/node_revision_delete": "^2.0@alpha",
"drupal/office_hours": "^1.1",
"drupal/panelizer": "^4.1 || ^5",
"drupal/panels": "4.7.0",
"drupal/panels": "^4.7",
"drupal/paragraphs": "^1.15",
"drupal/paragraphs_browser": "^1.1",
"drupal/paragraphs_edit": "^3.0",
Expand All @@ -168,7 +163,7 @@
"drupal/r4032login": "^2.2",
"drupal/rabbit_hole": "^1.0-beta5",
"drupal/realname": "^2.0@beta",
"drupal/recaptcha": "^3.2",
"drupal/recaptcha": "3.x-dev@dev",
"drupal/recaptcha_v3": "^1.8",
"drupal/redirect": "^1.2",
"drupal/rest_export_nested": "^1.0",
Expand All @@ -177,12 +172,12 @@
"drupal/salesforce": "5.0.3",
"drupal/samlauth": "^3.0",
"drupal/schema_metatag": "^2.2",
"drupal/search_api": "1.30.0",
"drupal/search_api": "^1.34",
"drupal/seckit": "^2.0",
"drupal/seven": "^1.0",
"drupal/shortcode": "^2.0",
"drupal/simple_gmap": "3.1.0",
"drupal/slick_entityreference": "2.1.0",
"drupal/simple_gmap": "^3.1",
"drupal/slick_entityreference": "^2.1",
"drupal/smart_trim": "^2.1",
"drupal/social_media": "^2.0",
"drupal/sophron": "^2.0",
Expand All @@ -202,7 +197,7 @@
"drupal/votingapi": "^3.0",
"drupal/webform": "^6.2@beta",
"drupal/workbench": "^1.0",
"drupal/workflow": "^1.1_",
"drupal/workflow": "^1.1",
"drupal/xmlsitemap": "^1.0",
"drush/drush": "*",
"enyo/dropzone": "^5.7.4",
Expand All @@ -221,7 +216,7 @@
},
"require-dev": {
"drupal/config_devel": "^1.2",
"drupal/core-dev": "^10",
"drupal/core-dev": "^10.2",
"drupal/devel": "^5.0",
"drupal/upgrade_status": "^4.0",
"phpspec/prophecy-phpunit": "^2",
Expand Down Expand Up @@ -295,6 +290,9 @@
"Patch for Type error DIG-3707 Dec 2023 Stella": "https://www.drupal.org/files/issues/2023-07-07/3372354-fix-addtocal-download.patch",
"Part two - menu not opening patch for Type error DIG-3707 - Dec 2023 Stella": "patches/dig-3707a.patch"
},
"drupal/recaptcha": {
"3449033. Enable Google Enterprise Cloud. DIG-4455 - DU June 2024": "https://www.drupal.org/files/issues/2024-06-03/recaptcha-enterprise-3449033-2.patch"
},
"drupal/core": {
"CoB patch - Fix original node is null on migration.": "patches/cob_migration_missing_original_001.patch",
"Optional end-date in date_range field type": "https://www.drupal.org/files/issues/2020-08-09/2794481-109.patch",
Expand Down
Loading

0 comments on commit c20cc35

Please sign in to comment.