Skip to content

Commit

Permalink
Merge branch 'main' into VACMS-14342-Set-up-CODEOWNERS
Browse files Browse the repository at this point in the history
  • Loading branch information
ndouglas authored Oct 31, 2023
2 parents c478d34 + c7d4da7 commit 998b65c
Show file tree
Hide file tree
Showing 76 changed files with 597 additions and 359 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,6 @@ Tugboat is a development server platform where you can preview CMS code changes
- [ ] [Tugboat for non-engineers](https://prod.cms.va.gov/help/demo-environments-tugboat-guides) SOCKS required

#### Other tools / access
- [ ] [Confluence](https://va-gov.atlassian.net/wiki/spaces/VAGOV/pages/179765342/2020-2021?NO_SSR=1) for team calendar, demo run of show, and reporting.
- [ ] [Google Drive](https://drive.google.com/drive/u/0/folders/0ADx85_gnl3Y4Uk9PVA?ths=true) for team documents. VA doesn't have access to view Google products while on the VA network. Use Github or downloadable files when sharing with VA.
- [ ] [Trello](https://trello.com/vacmsteam) for retro boards

Expand Down
4 changes: 0 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -430,10 +430,6 @@
"Fix Explorer with Layout Builder enabled - https://github.com/drupal-graphql/graphql/pull/1144": "patches/graphql_8x3x_layout_builder_incompat.patch",
"Remove outdated RouteQueryEnhancer controller reference - https://github.com/drupal-graphql/graphql/pull/1230": "patches/graphql_8x3x_query_route_enhancer_update.patch"
},
"drupal/health_check_url": {
"3294736 - PHP 8 Compatibility": "https://www.drupal.org/files/issues/2022-07-07/health_check_url_php8.patch",
"3287872 - Automated Drupal 10 compatibility fixes": "https://www.drupal.org/files/issues/2022-06-15/health_check_url.3.x-dev.rector.patch"
},
"drupal/hms_field": {
"3351452 - Argument #1 ($seconds) must be of type string|int, null given": "https://www.drupal.org/files/issues/2023-03-31/hms_field-field_null_value-3351452-1.patch"
},
Expand Down
65 changes: 36 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": "faaf25abea1e1ec90d1d817d60e1e379",
"content-hash": "821d933268d34fef8bc25e769b042df8",
"packages": [
{
"name": "alchemy/zippy",
Expand Down Expand Up @@ -5017,26 +5017,29 @@
},
{
"name": "drupal/embed",
"version": "1.6.0",
"version": "1.7.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/embed.git",
"reference": "8.x-1.6"
"reference": "8.x-1.7"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/embed-8.x-1.6.zip",
"reference": "8.x-1.6",
"shasum": "6d2964775c3228d122cd61904786b3640fa83045"
"url": "https://ftp.drupal.org/files/projects/embed-8.x-1.7.zip",
"reference": "8.x-1.7",
"shasum": "b7ca4264be51038f947d26b6725fc0446b224f60"
},
"require": {
"drupal/core": "^9.3 | ^10"
},
"require-dev": {
"drupal/ckeditor": "*"
},
"type": "drupal-module",
"extra": {
"drupal": {
"version": "8.x-1.6",
"datestamp": "1661298150",
"version": "8.x-1.7",
"datestamp": "1697642867",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
Expand Down Expand Up @@ -6997,26 +7000,26 @@
},
{
"name": "drupal/health_check_url",
"version": "3.1.0",
"version": "3.2.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/health_check_url.git",
"reference": "8.x-3.1"
"reference": "8.x-3.2"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/health_check_url-8.x-3.1.zip",
"reference": "8.x-3.1",
"shasum": "cffab34de69a7dbb76d81421822835815b989a09"
"url": "https://ftp.drupal.org/files/projects/health_check_url-8.x-3.2.zip",
"reference": "8.x-3.2",
"shasum": "453537dc3de3854c89a08ca85a01ddd1470ac4ae"
},
"require": {
"drupal/core": "^8 || ^9"
"drupal/core": "^8 || ^9 || ^10"
},
"type": "drupal-module",
"extra": {
"drupal": {
"version": "8.x-3.1",
"datestamp": "1625500176",
"version": "8.x-3.2",
"datestamp": "1696927831",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
Expand Down Expand Up @@ -9321,6 +9324,10 @@
"name": "amitaibu",
"homepage": "https://www.drupal.org/user/57511"
},
{
"name": "bluegeek9",
"homepage": "https://www.drupal.org/user/1286304"
},
{
"name": "fubhy",
"homepage": "https://www.drupal.org/user/761344"
Expand Down Expand Up @@ -11548,17 +11555,17 @@
},
{
"name": "drupal/search_api",
"version": "1.29.0",
"version": "1.30.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/search_api.git",
"reference": "8.x-1.29"
"reference": "8.x-1.30"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.29.zip",
"reference": "8.x-1.29",
"shasum": "4663abbcfe5dfc159ee0886fc6c437e998fc0653"
"url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.30.zip",
"reference": "8.x-1.30",
"shasum": "25bd2cfab6a6332c595fbc8be1c4cfff33a85ce8"
},
"require": {
"drupal/core": "^9.3 || ^10.0"
Expand All @@ -11579,16 +11586,16 @@
"type": "drupal-module",
"extra": {
"drupal": {
"version": "8.x-1.29",
"datestamp": "1679910252",
"version": "8.x-1.30",
"datestamp": "1697366291",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
}
},
"drush": {
"services": {
"drush.services.yml": "^9 || ^10"
"drush.services.yml": "^9 || ^10 || ^11"
}
}
},
Expand Down Expand Up @@ -18392,16 +18399,16 @@
},
{
"name": "phpstan/phpstan",
"version": "1.10.39",
"version": "1.10.40",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "d9dedb0413f678b4d03cbc2279a48f91592c97c4"
"reference": "93c84b5bf7669920d823631e39904d69b9c7dc5d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/d9dedb0413f678b4d03cbc2279a48f91592c97c4",
"reference": "d9dedb0413f678b4d03cbc2279a48f91592c97c4",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/93c84b5bf7669920d823631e39904d69b9c7dc5d",
"reference": "93c84b5bf7669920d823631e39904d69b9c7dc5d",
"shasum": ""
},
"require": {
Expand Down Expand Up @@ -18450,7 +18457,7 @@
"type": "tidelift"
}
],
"time": "2023-10-17T15:46:26+00:00"
"time": "2023-10-30T14:48:31+00:00"
},
{
"name": "phpstan/phpstan-deprecation-rules",
Expand Down
1 change: 1 addition & 0 deletions config/sync/content_model_documentation.settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ node: 1
paragraph: 1
taxonomy: 1
modules: 1
export_location: va_gov_migrate
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ content:
weight: 100
region: content
hidden:
breadcrumbs: true
field_administration: true
field_alert_type: true
field_dismissible_option: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ content:
weight: 100
region: content
hidden:
breadcrumbs: true
field_administration: true
field_content_block: true
field_description: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ content:
region: content
hidden:
body: true
breadcrumbs: true
field_administration: true
field_applied_to: true
field_last_saved_by_an_editor: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ content:
weight: 100
region: content
hidden:
breadcrumbs: true
content_moderation_control: true
field_administration: true
field_alert_single: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ content:
weight: 100
region: content
hidden:
breadcrumbs: true
content_moderation_control: true
field_administration: true
field_content_block: true
Expand Down
13 changes: 1 addition & 12 deletions config/sync/core.entity_view_display.node.event.teaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,6 @@ targetEntityType: node
bundle: event
mode: teaser
content:
breadcrumbs:
type: link
label: hidden
settings:
trim_length: 80
url_only: false
url_plain: false
rel: ''
target: ''
third_party_settings: { }
weight: -5
region: content
field_body:
type: text_default
label: hidden
Expand All @@ -68,6 +56,7 @@ content:
weight: 1
region: content
hidden:
breadcrumbs: true
content_moderation_control: true
field_additional_information_abo: true
field_additional_listings: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ content:
weight: 100
region: content
hidden:
breadcrumbs: true
content_moderation_control: true
field_administration: true
field_description: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ content:
weight: 100
region: content
hidden:
breadcrumbs: true
content_moderation_control: true
field_administration: true
field_alert_single: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ content:
weight: 1
region: content
hidden:
breadcrumbs: true
content_moderation_control: true
field_administration: true
field_alert_email_updates_button: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ content:
weight: 100
region: content
hidden:
breadcrumbs: true
field_administration: true
field_alert_dismissable: true
field_alert_email_updates_button: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ content:
weight: 100
region: content
hidden:
breadcrumbs: true
content_moderation_control: true
field_address: true
field_administration: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ content:
weight: 0
region: content
hidden:
breadcrumbs: true
content_moderation_control: true
field_administration: true
field_appointments_help_text: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ content:
weight: 8
region: content
hidden:
breadcrumbs: true
content_moderation_control: true
field_administration: true
field_appointments_help_text: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ bundle: health_care_local_health_service
mode: teaser
content: { }
hidden:
breadcrumbs: true
content_moderation_control: true
field_administration: true
field_appointments_help_text: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ content:
weight: 100
region: content
hidden:
breadcrumbs: true
content_moderation_control: true
field_administration: true
field_alert: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ content:
weight: 100
region: content
hidden:
breadcrumbs: true
content_moderation_control: true
field_administration: true
field_appointments_online: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ content:
weight: 100
region: content
hidden:
breadcrumbs: true
content_moderation_control: true
field_administration: true
field_description: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ content:
weight: 10
region: content
hidden:
breadcrumbs: true
content_moderation_control: true
field_administration: true
field_alert: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ content:
weight: 10
region: content
hidden:
breadcrumbs: true
content_moderation_control: true
field_administration: true
field_alert: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ content:
weight: 100
region: content
hidden:
breadcrumbs: true
content_moderation_control: true
field_administration: true
field_description: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ content:
weight: 100
region: content
hidden:
breadcrumbs: true
content_moderation_control: true
field_administration: true
field_description: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ content:
weight: 100
region: content
hidden:
breadcrumbs: true
content_moderation_control: true
field_administration: true
field_alert_single: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ content:
weight: 100
region: content
hidden:
breadcrumbs: true
content_moderation_control: true
field_administration: true
field_alert_single: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ content:
weight: 100
region: content
hidden:
breadcrumbs: true
content_moderation_control: true
field_administration: true
field_author: true
Expand Down
Loading

0 comments on commit 998b65c

Please sign in to comment.