Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/composer/phpstan/phpstan-1.10.41
Browse files Browse the repository at this point in the history
  • Loading branch information
tonytaylor authored Nov 7, 2023
2 parents 48c5578 + 454ca96 commit 7af924b
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 21 deletions.
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.3380",
"va-gov/content-build": "^0.0.3381",
"vlucas/phpdotenv": "^5.3",
"webflo/drupal-finder": "^1.0.0",
"webmozart/path-util": "^2.3",
Expand Down
40 changes: 20 additions & 20 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": "ef9631d803a8b5674de8dfae702d59e1",
"content-hash": "47d263ff2ec7e2cd8c4f8629a9acac56",
"packages": [
{
"name": "alchemy/zippy",
Expand Down Expand Up @@ -202,16 +202,16 @@
},
{
"name": "caxy/php-htmldiff",
"version": "v0.1.14",
"version": "v0.1.15",
"source": {
"type": "git",
"url": "https://github.com/caxy/php-htmldiff.git",
"reference": "3f8ee7edda3d7c6d2e58a02d70a12d3242c84ea5"
"reference": "6342b02ddb86fd36093ad7e2db2efc21f01ab7cd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/caxy/php-htmldiff/zipball/3f8ee7edda3d7c6d2e58a02d70a12d3242c84ea5",
"reference": "3f8ee7edda3d7c6d2e58a02d70a12d3242c84ea5",
"url": "https://api.github.com/repos/caxy/php-htmldiff/zipball/6342b02ddb86fd36093ad7e2db2efc21f01ab7cd",
"reference": "6342b02ddb86fd36093ad7e2db2efc21f01ab7cd",
"shasum": ""
},
"require": {
Expand Down Expand Up @@ -257,9 +257,9 @@
],
"support": {
"issues": "https://github.com/caxy/php-htmldiff/issues",
"source": "https://github.com/caxy/php-htmldiff/tree/v0.1.14"
"source": "https://github.com/caxy/php-htmldiff/tree/v0.1.15"
},
"time": "2022-01-19T11:09:59+00:00"
"time": "2023-11-05T23:49:04+00:00"
},
{
"name": "chi-teck/drupal-code-generator",
Expand Down Expand Up @@ -5878,26 +5878,26 @@
},
{
"name": "drupal/epp",
"version": "1.5.0",
"version": "1.6.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/epp.git",
"reference": "8.x-1.5"
"reference": "8.x-1.6"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/epp-8.x-1.5.zip",
"reference": "8.x-1.5",
"shasum": "54260bfa2330d36e0dc2d7c6c4574e4b5f084042"
"url": "https://ftp.drupal.org/files/projects/epp-8.x-1.6.zip",
"reference": "8.x-1.6",
"shasum": "5ccebedc80ee904769e60298e76e71ca81ca0eb6"
},
"require": {
"drupal/core": "^8.7.7 || ^9 || ^10"
},
"type": "drupal-module",
"extra": {
"drupal": {
"version": "8.x-1.5",
"datestamp": "1679356317",
"version": "8.x-1.6",
"datestamp": "1699288592",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
Expand Down Expand Up @@ -26915,16 +26915,16 @@
},
{
"name": "va-gov/content-build",
"version": "v0.0.3380",
"version": "v0.0.3381",
"source": {
"type": "git",
"url": "https://github.com/department-of-veterans-affairs/content-build.git",
"reference": "eaaec0f3f67e5fe9371c2a16aeba8351875d1e22"
"reference": "d91b114fe5280626fb5dacaffc4036e5e3023db6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/eaaec0f3f67e5fe9371c2a16aeba8351875d1e22",
"reference": "eaaec0f3f67e5fe9371c2a16aeba8351875d1e22",
"url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/d91b114fe5280626fb5dacaffc4036e5e3023db6",
"reference": "d91b114fe5280626fb5dacaffc4036e5e3023db6",
"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.3380"
"source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3381"
},
"time": "2023-11-03T19:33:01+00:00"
"time": "2023-11-06T17:09:37+00:00"
},
{
"name": "vlucas/phpdotenv",
Expand Down
2 changes: 2 additions & 0 deletions config/sync/views.view.media.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3358,6 +3358,8 @@ display:
page_1: '0'
filename: images-export.csv
automatic_download: false
export_method: batch
export_batch_size: 500
store_in_public_file_directory: null
custom_redirect_path: false
redirect_to_display: none
Expand Down

0 comments on commit 7af924b

Please sign in to comment.