Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/composer/drupal/tzfield-1.9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
edmund-dunn authored Nov 17, 2023
2 parents 4bd3c76 + e98afb7 commit e1dbf8a
Show file tree
Hide file tree
Showing 111 changed files with 920 additions and 322 deletions.
30 changes: 26 additions & 4 deletions .github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

name: CMS Collaboration Cycle Request
name: "CMS Collaboration Cycle Request"
description: Use this template to begin engaging with the CMS Collaboration Cycle.
title: "CMS Collaboration Cycle for [Team Name, Product Name, Feature Name]"
labels: CMS Team, Needs Analysis, CMS-Collab-Cycle, Epic
Expand All @@ -11,7 +11,7 @@ body:
- type: markdown
attributes:
value: |
Before engaging with the CMS Collaboration Cycle, please fill out the form below to help the CMS Team determine what level of support and which touchpoints are needed for your work. Have questions about this form? Reach out to the CMS Team in the cms-support Slack channel.
Before engaging with the CMS Collaboration Cycle, please fill out the form below to help the CMS Team determine what level of support and which touchpoints are needed for your work. Have questions about this form? Read our [Kickoff Request documentation](https://github.com/department-of-veterans-affairs/va.gov-team/blob/master/platform/cms/collaboration-cycle/kickoff.md) in Github or reach out to the CMS Team in the cms-support Slack channel.
- type: input
id: product-outline
attributes:
Expand Down Expand Up @@ -64,7 +64,7 @@ body:
- type: dropdown
id: research
attributes:
label: Are you doing user research with CMS editors?
label: Will you be doing user research with CMS editors?
multiple: false
options:
- "Yes"
Expand All @@ -83,6 +83,17 @@ body:
- "Maybe (Leave notes in the Additional Information section of this form)"
validations:
required: true
- type: dropdown
id: DS
attributes:
label: Will your work require introducing a new CMS Design System component or changes to an existing component?
multiple: false
options:
- "Yes"
- "No"
- "Maybe (Leave notes in the Additional Information section of this form)"
validations:
required: true
- type: dropdown
id: modules
attributes:
Expand All @@ -94,10 +105,21 @@ body:
- "Maybe (Leave notes in the Additional Information section of this form)"
validations:
required: true
- type: dropdown
id: fields
attributes:
label: Will your work require introducing new input fields or making changes to existing input fields?
multiple: false
options:
- "Yes"
- "No"
- "Maybe (Leave notes in the Additional Information section of this form)"
validations:
required: true
- type: dropdown
id: analytics
attributes:
label: Do you need to capture any analytics or metrics?
label: Will this work require you to capture any analytics or metrics?
multiple: false
options:
- "Yes"
Expand Down
12 changes: 5 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"require-dev": {
"behat/mink": "^1.10",
"behat/mink-browserkit-driver": "^2.1",
"digitalrevolution/php-codesniffer-baseline": "^1.1",
"drupal/devel": "^5.0",
"drupal/html_tag_usage": "^1.0@beta",
"drupal/media_entity_generic": "^1.0"
Expand Down Expand Up @@ -82,7 +83,7 @@
"drupal/geofield_map": "^3.0",
"drupal/google_analytics": "^4.0",
"drupal/govdelivery_bulletins": "^1.2",
"drupal/graphql": "3.1.0",
"drupal/graphql": "^3.4",
"drupal/graphql_core": "^3.1.0",
"drupal/graphql_menu": "^1.0@alpha",
"drupal/graphql_metatag": "^1.0",
Expand Down Expand Up @@ -207,7 +208,7 @@
"symfony/phpunit-bridge": "^5.1",
"symfony/process": "^4.0",
"symfony/routing": "^4.0",
"va-gov/content-build": "^0.0.3383",
"va-gov/content-build": "^0.0.3387",
"vlucas/phpdotenv": "^5.3",
"webflo/drupal-finder": "^1.0.0",
"webmozart/path-util": "^2.3",
Expand Down Expand Up @@ -289,7 +290,8 @@
"dealerdirect/phpcodesniffer-composer-installer": true,
"php-http/discovery": true,
"cweagans/composer-patches": true,
"orakili/composer-drupal-info-file-patch-helper": true
"orakili/composer-drupal-info-file-patch-helper": true,
"digitalrevolution/php-codesniffer-baseline": true
}
},
"extra": {
Expand Down Expand Up @@ -426,10 +428,6 @@
"drupal/flysystem_s3": {
"3297257 - Automated Drupal 10 compatibility fixes": "https://www.drupal.org/files/issues/2023-04-27/3297257-drupal-10-compatibility-fixes_0.patch"
},
"drupal/graphql": {
"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/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
Loading

0 comments on commit e1dbf8a

Please sign in to comment.