Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/composer/drupal/tzfield-1.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
tonytaylor authored Nov 6, 2023
2 parents b2a6469 + 0659320 commit 858d14e
Show file tree
Hide file tree
Showing 10 changed files with 509 additions and 39 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
NODE_TLS_REJECT_UNAUTHORIZED: 0

- name: Cypress run
uses: cypress-io/github-action@59810ebfa5a5ac6fcfdcfdf036d1cd4d083a88f2 # v6.5.0
uses: cypress-io/github-action@ebe8b24c4428922d0f793a5c4c96853a633180e3 # v6.6.0
with:
wait-on: "${{ inputs.preview_url }}"
command: 'npm run test:cypress:parallel'
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@
"symfony/phpunit-bridge": "^5.1",
"symfony/process": "^4.0",
"symfony/routing": "^4.0",
"va-gov/content-build": "^0.0.3378",
"va-gov/content-build": "^0.0.3380",
"vlucas/phpdotenv": "^5.3",
"webflo/drupal-finder": "^1.0.0",
"webmozart/path-util": "^2.3",
Expand Down
57 changes: 28 additions & 29 deletions composer.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "6e4c15c31d64e3479e8c7bef49129d53",
"content-hash": "ef9631d803a8b5674de8dfae702d59e1",
"packages": [
{
"name": "alchemy/zippy",
Expand Down Expand Up @@ -3701,17 +3701,17 @@
},
{
"name": "drupal/content_model_documentation",
"version": "1.0.21",
"version": "1.0.22",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/content_model_documentation.git",
"reference": "1.0.21"
"reference": "1.0.22"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/content_model_documentation-1.0.21.zip",
"reference": "1.0.21",
"shasum": "396e36c2a3d143b364341635848bed34ad656746"
"url": "https://ftp.drupal.org/files/projects/content_model_documentation-1.0.22.zip",
"reference": "1.0.22",
"shasum": "d9205b8f9dcfd3dd55337d0fd49c864140fc2077"
},
"require": {
"drupal/config_views": "~2.1",
Expand All @@ -3724,8 +3724,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
"version": "1.0.21",
"datestamp": "1698390837",
"version": "1.0.22",
"datestamp": "1699252266",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
Expand Down Expand Up @@ -13285,21 +13285,21 @@
},
{
"name": "drupal/views_data_export",
"version": "1.3.0",
"version": "1.4.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/views_data_export.git",
"reference": "8.x-1.3"
"reference": "8.x-1.4"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/views_data_export-8.x-1.3.zip",
"reference": "8.x-1.3",
"shasum": "a8a5483e13787f2bb3eb66d9b0f19d96c0d8d7c1"
"url": "https://ftp.drupal.org/files/projects/views_data_export-8.x-1.4.zip",
"reference": "8.x-1.4",
"shasum": "70dede9fdf50601232f068e67309d361341e88c5"
},
"require": {
"drupal/core": "^9 || ^10",
"drupal/csv_serialization": "~1.4 || ~2.0 || ~3"
"drupal/csv_serialization": "~1.4 || ~2.0 || ~3 || ~4"
},
"require-dev": {
"drupal/search_api": "~1.12",
Expand All @@ -13308,8 +13308,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
"version": "8.x-1.3",
"datestamp": "1679072666",
"version": "8.x-1.4",
"datestamp": "1698948991",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
Expand Down Expand Up @@ -16279,16 +16279,16 @@
},
{
"name": "mglaman/phpstan-drupal",
"version": "1.2.0",
"version": "1.2.1",
"source": {
"type": "git",
"url": "https://github.com/mglaman/phpstan-drupal.git",
"reference": "d721420086f146640acecebb7a678661a66e97d5"
"reference": "920c6b972a832046327f66dc6ff7448e3b5d6e4c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/d721420086f146640acecebb7a678661a66e97d5",
"reference": "d721420086f146640acecebb7a678661a66e97d5",
"url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/920c6b972a832046327f66dc6ff7448e3b5d6e4c",
"reference": "920c6b972a832046327f66dc6ff7448e3b5d6e4c",
"shasum": ""
},
"require": {
Expand Down Expand Up @@ -16363,7 +16363,7 @@
"description": "Drupal extension and rules for PHPStan",
"support": {
"issues": "https://github.com/mglaman/phpstan-drupal/issues",
"source": "https://github.com/mglaman/phpstan-drupal/tree/1.2.0"
"source": "https://github.com/mglaman/phpstan-drupal/tree/1.2.1"
},
"funding": [
{
Expand All @@ -16379,7 +16379,7 @@
"type": "tidelift"
}
],
"time": "2023-08-24T20:32:56+00:00"
"time": "2023-11-03T13:17:28+00:00"
},
{
"name": "michelf/php-markdown",
Expand Down Expand Up @@ -26915,16 +26915,16 @@
},
{
"name": "va-gov/content-build",
"version": "v0.0.3378",
"version": "v0.0.3380",
"source": {
"type": "git",
"url": "https://github.com/department-of-veterans-affairs/content-build.git",
"reference": "51b6a6dafdb360cd2c7a02e4a7aa14453d40e9ae"
"reference": "eaaec0f3f67e5fe9371c2a16aeba8351875d1e22"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/51b6a6dafdb360cd2c7a02e4a7aa14453d40e9ae",
"reference": "51b6a6dafdb360cd2c7a02e4a7aa14453d40e9ae",
"url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/eaaec0f3f67e5fe9371c2a16aeba8351875d1e22",
"reference": "eaaec0f3f67e5fe9371c2a16aeba8351875d1e22",
"shasum": ""
},
"type": "node-project",
Expand All @@ -26951,9 +26951,9 @@
"description": "Front-end for VA.gov. This repository contains the code that generates the www.va.gov website. It contains a Metalsmith static site builder that uses a Drupal CMS for content. This file is here to publish releases to https://packagist.org/packages/va-gov/content-build, so that the CMS CI system can install it and update it using standard composer processes, and so that we can run tests across both systems. See https://github.com/department-of-veterans-affairs/va.gov-cms for the CMS repo, and stand by for more documentation.",
"support": {
"issues": "https://github.com/department-of-veterans-affairs/content-build/issues",
"source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3378"
"source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3380"
},
"time": "2023-10-30T17:47:27+00:00"
"time": "2023-11-03T19:33:01+00:00"
},
{
"name": "vlucas/phpdotenv",
Expand Down Expand Up @@ -27799,7 +27799,6 @@
"drupal/styleguide": 10,
"drupal/user_history": 15,
"drupal/viewfield": 10,
"drupal/views_data_export": 10,
"drupal/html_tag_usage": 10
},
"prefer-stable": true,
Expand Down
14 changes: 13 additions & 1 deletion config/sync/core.entity_form_display.media.document.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ third_party_settings:
group_governance:
children:
- field_owner
- field_media_in_library
label: 'Section settings'
region: content
parent_name: ''
Expand All @@ -41,6 +42,13 @@ content:
settings:
progress_indicator: throbber
third_party_settings: { }
field_media_in_library:
type: boolean_checkbox
weight: 4
region: content
settings:
display_label: true
third_party_settings: { }
field_media_submission_guideline:
type: markup
weight: 0
Expand All @@ -61,9 +69,13 @@ content:
size: 60
placeholder: ''
third_party_settings: { }
translation:
weight: 10
region: content
settings: { }
third_party_settings: { }
hidden:
created: true
field_media_in_library: true
langcode: true
moderation_state: true
path: true
Expand Down
1 change: 1 addition & 0 deletions config/sync/feature_toggle.features.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ features:
feature_single_value_field_link: FEATURE_SINGLE_VALUE_FIELD_LINK
feature_health_connect_number: FEATURE_HEALTH_CONNECT_NUMBER
feature_event_outreach_checkbox: FEATURE_EVENT_OUTREACH_CHECKBOX
feature_event_outreach_checkbox_all: FEATURE_EVENT_OUTREACH_CHECKBOX_ALL
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ dependencies:
config:
- field.storage.node.field_service_location
- node.type.service_region
- paragraphs.paragraphs_type.service_location
module:
- entity_reference_revisions
id: node.service_region.field_service_location
Expand All @@ -19,5 +20,144 @@ default_value: { }
default_value_callback: ''
settings:
handler: 'default:paragraph'
handler_settings: { }
handler_settings:
target_bundles:
service_location: service_location
negate: 0
target_bundles_drag_drop:
address:
weight: 46
enabled: false
alert:
weight: 47
enabled: false
alert_single:
weight: 48
enabled: false
audience_topics:
weight: 49
enabled: false
basic_accordion:
weight: 50
enabled: false
button:
weight: 51
enabled: false
centralized_content_descriptor:
weight: 52
enabled: false
checklist:
weight: 53
enabled: false
checklist_item:
weight: 54
enabled: false
collapsible_panel:
weight: 55
enabled: false
collapsible_panel_item:
weight: 56
enabled: false
contact_information:
weight: 57
enabled: false
downloadable_file:
weight: 58
enabled: false
email_contact:
weight: 59
enabled: false
embedded_video:
weight: 60
enabled: false
expandable_text:
weight: 61
enabled: false
featured_content:
weight: 62
enabled: false
health_care_local_facility_servi:
weight: 63
enabled: false
link_teaser:
weight: 64
enabled: false
link_teaser_with_image:
weight: 65
enabled: false
list_of_link_teasers:
weight: 68
enabled: false
list_of_links:
weight: 67
enabled: false
lists_of_links:
weight: 66
enabled: false
magichead_group:
weight: 69
enabled: false
media:
weight: 70
enabled: false
media_list_images:
weight: 71
enabled: false
media_list_videos:
weight: 72
enabled: false
non_reusable_alert:
weight: 73
enabled: false
number_callout:
weight: 74
enabled: false
phone_number:
weight: 75
enabled: false
process:
weight: 76
enabled: false
q_a:
weight: 77
enabled: false
q_a_group:
weight: 78
enabled: false
q_a_section:
weight: 79
enabled: false
react_widget:
weight: 80
enabled: false
rich_text_char_limit_1000:
weight: 81
enabled: false
service_location:
weight: 82
enabled: true
service_location_address:
weight: 83
enabled: false
situation_update:
weight: 84
enabled: false
spanish_translation_summary:
weight: 85
enabled: false
staff_profile:
weight: 86
enabled: false
step:
weight: 87
enabled: false
step_by_step:
weight: 88
enabled: false
table:
weight: 89
enabled: false
wysiwyg:
weight: 90
enabled: false
field_type: entity_reference_revisions
Loading

0 comments on commit 858d14e

Please sign in to comment.