diff --git a/.circleci/config.yml b/.circleci/config.yml
index f3eb867db..f1f7bb61c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -193,8 +193,24 @@ update_dependencies: &update_dependencies
vendor/bin/blt circleci:update
- save_cache: *save_cache
-# Declare all of the jobs we should run.
+run-content-stage: &run-content-stage
+ docker:
+ - image: cimg/php:7.4
+ steps:
+ - checkout
+ - run: composer install --optimize-autoloader
+ - *disable_telemetry
+ - run: vendor/bin/blt stage --no-interaction
+ - slack/notify:
+ event: fail
+ channel: C750VBZCZ
+ template: basic_fail_1
+ - slack/notify:
+ event: pass
+ channel: C750VBZCZ
+ template: basic_success_1
+# Declare all the jobs we should run.
jobs:
run-updates:
<<: *update_dependencies
@@ -212,8 +228,12 @@ jobs:
<<: *deploy_branch
run-deploy-tag:
<<: *deploy_tag
+ run-content-stage:
+ <<: *run-content-stage
version: 2.1
+orbs:
+ slack: circleci/slack@4.4.2
# Declare a workflow that runs all of our jobs in parallel.
workflows:
version: 2.1
@@ -260,3 +280,14 @@ workflows:
- /9\..*-release/
jobs:
- run-updates
+ 'Stage Content from Production':
+ jobs:
+ - run-content-stage:
+ context: slack-secrets
+ triggers:
+ - schedule:
+ cron: "0 23 * * 3"
+ filters:
+ branches:
+ only:
+ - /develop/
diff --git a/blt/src/Blt/Plugin/Commands/HsAcquiaApiCommands.php b/blt/src/Blt/Plugin/Commands/HsAcquiaApiCommands.php
index ba38e693c..68077b903 100644
--- a/blt/src/Blt/Plugin/Commands/HsAcquiaApiCommands.php
+++ b/blt/src/Blt/Plugin/Commands/HsAcquiaApiCommands.php
@@ -149,7 +149,7 @@ public function syncStaging(array $options = [
$this->connectAcquiaApi();
$sites = $this->getSitesToSync($task_started, $options);
- if (!$this->confirm(sprintf('Are you sure you wish to stage the following sites: %s', implode(', ', $sites)))) {
+ if (empty($options['no-interaction']) && !$this->confirm(sprintf('Are you sure you wish to stage the following sites: %s', implode(', ', $sites)))) {
return;
}
$count = count($sites);
@@ -243,6 +243,15 @@ protected function getMachineName($message) {
* {@inheritDoc}
*/
protected function connectAcquiaApi() {
+ $acquia_conf = $_SERVER['HOME'] . '/.acquia/cloud_api.conf';
+ $key = getenv('ACQUIA_KEY');
+ $secret = getenv('ACQUIA_SECRET');
+ if ($key && $secret && !file_exists($acquia_conf)) {
+ mkdir(dirname($acquia_conf), 0777, TRUE);
+ $conf = ['key' => $key, 'secret' => $secret];
+ file_put_contents($acquia_conf, json_encode($conf, JSON_PRETTY_PRINT));
+ }
+
if (!$this->acquiaApplications) {
$this->traitConnectAcquiaApi();
}
diff --git a/composer.lock b/composer.lock
index 0ae07f81a..a0635e2d7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -255,16 +255,16 @@
},
{
"name": "caxy/php-htmldiff",
- "version": "v0.1.12",
+ "version": "v0.1.13",
"source": {
"type": "git",
"url": "https://github.com/caxy/php-htmldiff.git",
- "reference": "7fb8aa0ad77864f1d3604ae4a31af9cbabb91485"
+ "reference": "aca63d7da8c9cf3c0c3c27fb41af1ffb1b1d4b3a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/caxy/php-htmldiff/zipball/7fb8aa0ad77864f1d3604ae4a31af9cbabb91485",
- "reference": "7fb8aa0ad77864f1d3604ae4a31af9cbabb91485",
+ "url": "https://api.github.com/repos/caxy/php-htmldiff/zipball/aca63d7da8c9cf3c0c3c27fb41af1ffb1b1d4b3a",
+ "reference": "aca63d7da8c9cf3c0c3c27fb41af1ffb1b1d4b3a",
"shasum": ""
},
"require": {
@@ -310,9 +310,9 @@
],
"support": {
"issues": "https://github.com/caxy/php-htmldiff/issues",
- "source": "https://github.com/caxy/php-htmldiff/tree/v0.1.12"
+ "source": "https://github.com/caxy/php-htmldiff/tree/v0.1.13"
},
- "time": "2021-04-05T21:19:33+00:00"
+ "time": "2021-09-27T22:01:33+00:00"
},
{
"name": "chi-teck/drupal-code-generator",
@@ -723,16 +723,16 @@
},
{
"name": "consolidation/annotated-command",
- "version": "4.3.1",
+ "version": "4.3.3",
"source": {
"type": "git",
"url": "https://github.com/consolidation/annotated-command.git",
- "reference": "386d2c9253675bbb4b7f04c6bc52f8e74c0d4cc6"
+ "reference": "bf1503225f1cfb372884c71b83763b60a40c875a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/386d2c9253675bbb4b7f04c6bc52f8e74c0d4cc6",
- "reference": "386d2c9253675bbb4b7f04c6bc52f8e74c0d4cc6",
+ "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/bf1503225f1cfb372884c71b83763b60a40c875a",
+ "reference": "bf1503225f1cfb372884c71b83763b60a40c875a",
"shasum": ""
},
"require": {
@@ -772,9 +772,9 @@
"description": "Initialize Symfony Console commands from annotated command class methods.",
"support": {
"issues": "https://github.com/consolidation/annotated-command/issues",
- "source": "https://github.com/consolidation/annotated-command/tree/4.3.1"
+ "source": "https://github.com/consolidation/annotated-command/tree/4.3.3"
},
- "time": "2021-08-30T03:50:47+00:00"
+ "time": "2021-09-27T00:56:55+00:00"
},
{
"name": "consolidation/comments",
@@ -1269,16 +1269,16 @@
},
{
"name": "consolidation/site-alias",
- "version": "3.1.0",
+ "version": "3.1.1",
"source": {
"type": "git",
"url": "https://github.com/consolidation/site-alias.git",
- "reference": "9ed3c590be9fcf9fea69c73456c2fd4b27f5204c"
+ "reference": "e824b57253d9174f4a500f87e6d0e1e497c2a50a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/consolidation/site-alias/zipball/9ed3c590be9fcf9fea69c73456c2fd4b27f5204c",
- "reference": "9ed3c590be9fcf9fea69c73456c2fd4b27f5204c",
+ "url": "https://api.github.com/repos/consolidation/site-alias/zipball/e824b57253d9174f4a500f87e6d0e1e497c2a50a",
+ "reference": "e824b57253d9174f4a500f87e6d0e1e497c2a50a",
"shasum": ""
},
"require": {
@@ -1321,9 +1321,9 @@
"description": "Manage alias records for local and remote sites.",
"support": {
"issues": "https://github.com/consolidation/site-alias/issues",
- "source": "https://github.com/consolidation/site-alias/tree/3.1.0"
+ "source": "https://github.com/consolidation/site-alias/tree/3.1.1"
},
- "time": "2021-02-20T20:03:10+00:00"
+ "time": "2021-09-21T00:30:48+00:00"
},
{
"name": "consolidation/site-process",
@@ -1957,17 +1957,17 @@
},
{
"name": "drupal/acquia_connector",
- "version": "3.0.3",
+ "version": "3.0.4",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/acquia_connector.git",
- "reference": "3.0.3"
+ "reference": "3.0.4"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/acquia_connector-3.0.3.zip",
- "reference": "3.0.3",
- "shasum": "ca5e42dd283313227a5e0d99d628c15d70112477"
+ "url": "https://ftp.drupal.org/files/projects/acquia_connector-3.0.4.zip",
+ "reference": "3.0.4",
+ "shasum": "318f9a85c9e24565d9a347d467d53d99644d7bc3"
},
"require": {
"drupal/core": "^8.9 || ^9",
@@ -1976,8 +1976,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "3.0.3",
- "datestamp": "1618428132",
+ "version": "3.0.4",
+ "datestamp": "1632414112",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -2313,17 +2313,17 @@
},
{
"name": "drupal/admin_toolbar",
- "version": "3.0.2",
+ "version": "3.0.3",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/admin_toolbar.git",
- "reference": "3.0.2"
+ "reference": "3.0.3"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/admin_toolbar-3.0.2.zip",
- "reference": "3.0.2",
- "shasum": "a3b7a8030695d0c1d49ec57786321e2dd142184a"
+ "url": "https://ftp.drupal.org/files/projects/admin_toolbar-3.0.3.zip",
+ "reference": "3.0.3",
+ "shasum": "ce735c931c0bd6da79bd8e45ca459d61015bbe44"
},
"require": {
"drupal/core": "^8.8.0 || ^9.0"
@@ -2334,8 +2334,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "3.0.2",
- "datestamp": "1629907124",
+ "version": "3.0.3",
+ "datestamp": "1632322068",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -8027,9 +8027,6 @@
"reference": "8.x-1.2",
"shasum": "a4c4f6a7846971f494ee7850132bfbe220ff8687"
},
- "require": {
- "drupal/core": "~9.0.0-beta3 || 9.1.* || 9.2.*"
- },
"type": "library",
"extra": {
"drupal": {
@@ -9262,8 +9259,8 @@
"role": "Contributors"
},
{
- "name": "gausarts",
- "homepage": "https://www.drupal.org/user/159062"
+ "name": "shadcn",
+ "homepage": "https://www.drupal.org/user/571032"
},
{
"name": "thalles",
@@ -10528,17 +10525,17 @@
},
{
"name": "drupal/views_infinite_scroll",
- "version": "1.8.0",
+ "version": "1.9.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/views_infinite_scroll.git",
- "reference": "8.x-1.8"
+ "reference": "8.x-1.9"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/views_infinite_scroll-8.x-1.8.zip",
- "reference": "8.x-1.8",
- "shasum": "b9fceb24184792fb81c4e2ff1bf7f18fd8e50674"
+ "url": "https://ftp.drupal.org/files/projects/views_infinite_scroll-8.x-1.9.zip",
+ "reference": "8.x-1.9",
+ "shasum": "875d58d317d48036ed1d9ef538bc8a76bc3dcb5b"
},
"require": {
"drupal/core": "^8.8 || ^9"
@@ -10546,8 +10543,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-1.8",
- "datestamp": "1615218916",
+ "version": "8.x-1.9",
+ "datestamp": "1632421785",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -11276,16 +11273,16 @@
},
{
"name": "enyo/dropzone",
- "version": "v5.9.2",
+ "version": "v5.9.3",
"source": {
"type": "git",
"url": "https://github.com/dropzone/dropzone-packagist.git",
- "reference": "58574133fea351fc0b2d7461c6bf2431607c3a9a"
+ "reference": "286b2dc1f1195bd12169e4c9d5f91cfbe46e245f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/dropzone/dropzone-packagist/zipball/58574133fea351fc0b2d7461c6bf2431607c3a9a",
- "reference": "58574133fea351fc0b2d7461c6bf2431607c3a9a",
+ "url": "https://api.github.com/repos/dropzone/dropzone-packagist/zipball/286b2dc1f1195bd12169e4c9d5f91cfbe46e245f",
+ "reference": "286b2dc1f1195bd12169e4c9d5f91cfbe46e245f",
"shasum": ""
},
"type": "library",
@@ -11310,9 +11307,9 @@
],
"support": {
"issues": "https://github.com/dropzone/dropzone-packagist/issues",
- "source": "https://github.com/dropzone/dropzone-packagist/tree/v5.9.2"
+ "source": "https://github.com/dropzone/dropzone-packagist/tree/v5.9.3"
},
- "time": "2021-04-02T14:29:45+00:00"
+ "time": "2021-09-21T17:03:36+00:00"
},
{
"name": "ezyang/htmlpurifier",
@@ -11370,23 +11367,24 @@
},
{
"name": "fileeye/mimemap",
- "version": "1.1.5",
+ "version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/FileEye/MimeMap.git",
- "reference": "9efaad84adce38f2ee49331b2bd684c83fd9aa3b"
+ "reference": "b5383beaa03eb613dfb922c9d935c3b94945397a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/FileEye/MimeMap/zipball/9efaad84adce38f2ee49331b2bd684c83fd9aa3b",
- "reference": "9efaad84adce38f2ee49331b2bd684c83fd9aa3b",
+ "url": "https://api.github.com/repos/FileEye/MimeMap/zipball/b5383beaa03eb613dfb922c9d935c3b94945397a",
+ "reference": "b5383beaa03eb613dfb922c9d935c3b94945397a",
"shasum": ""
},
"require": {
- "php": ">=5.4"
+ "composer-runtime-api": "^2.0.0",
+ "php": ">=5.6"
},
"require-dev": {
- "phpunit/phpunit": "<10",
+ "phpunit/phpunit": "^5 | ^6 | ^7 | ^8 | ^9",
"sebastian/comparator": "*",
"sebastian/diff": "*",
"squizlabs/php_codesniffer": "*",
@@ -11423,9 +11421,9 @@
],
"support": {
"issues": "https://github.com/FileEye/MimeMap/issues",
- "source": "https://github.com/FileEye/MimeMap/tree/1.1.5"
+ "source": "https://github.com/FileEye/MimeMap/tree/1.2.0"
},
- "time": "2021-04-02T20:21:45+00:00"
+ "time": "2021-09-21T16:22:01+00:00"
},
{
"name": "firebase/php-jwt",
@@ -12875,16 +12873,16 @@
},
{
"name": "nikic/php-parser",
- "version": "v4.12.0",
+ "version": "v4.13.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "6608f01670c3cc5079e18c1dab1104e002579143"
+ "reference": "50953a2691a922aa1769461637869a0a2faa3f53"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6608f01670c3cc5079e18c1dab1104e002579143",
- "reference": "6608f01670c3cc5079e18c1dab1104e002579143",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/50953a2691a922aa1769461637869a0a2faa3f53",
+ "reference": "50953a2691a922aa1769461637869a0a2faa3f53",
"shasum": ""
},
"require": {
@@ -12925,9 +12923,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v4.12.0"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.0"
},
- "time": "2021-07-21T10:44:31+00:00"
+ "time": "2021-09-20T12:20:58+00:00"
},
{
"name": "onlyextart/colorbox",
@@ -22401,16 +22399,16 @@
},
{
"name": "mikey179/vfsstream",
- "version": "v1.6.9",
+ "version": "v1.6.10",
"source": {
"type": "git",
"url": "https://github.com/bovigo/vfsStream.git",
- "reference": "2257e326dc3d0f50e55d0a90f71e37899f029718"
+ "reference": "250c0825537d501e327df879fb3d4cd751933b85"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/2257e326dc3d0f50e55d0a90f71e37899f029718",
- "reference": "2257e326dc3d0f50e55d0a90f71e37899f029718",
+ "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/250c0825537d501e327df879fb3d4cd751933b85",
+ "reference": "250c0825537d501e327df879fb3d4cd751933b85",
"shasum": ""
},
"require": {
@@ -22448,7 +22446,7 @@
"source": "https://github.com/bovigo/vfsStream/tree/master",
"wiki": "https://github.com/bovigo/vfsStream/wiki"
},
- "time": "2021-07-16T08:08:02+00:00"
+ "time": "2021-09-25T08:05:01+00:00"
},
{
"name": "myclabs/deep-copy",
@@ -22796,16 +22794,16 @@
},
{
"name": "phpdocumentor/type-resolver",
- "version": "1.4.0",
+ "version": "1.5.0",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git",
- "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0"
+ "reference": "30f38bffc6f24293dadd1823936372dfa9e86e2f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0",
- "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0",
+ "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/30f38bffc6f24293dadd1823936372dfa9e86e2f",
+ "reference": "30f38bffc6f24293dadd1823936372dfa9e86e2f",
"shasum": ""
},
"require": {
@@ -22813,7 +22811,8 @@
"phpdocumentor/reflection-common": "^2.0"
},
"require-dev": {
- "ext-tokenizer": "*"
+ "ext-tokenizer": "*",
+ "psalm/phar": "^4.8"
},
"type": "library",
"extra": {
@@ -22839,9 +22838,9 @@
"description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
"support": {
"issues": "https://github.com/phpDocumentor/TypeResolver/issues",
- "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.4.0"
+ "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.5.0"
},
- "time": "2020-09-17T18:55:26+00:00"
+ "time": "2021-09-17T15:28:14+00:00"
},
{
"name": "phpspec/prophecy",
@@ -22964,23 +22963,23 @@
},
{
"name": "phpunit/php-code-coverage",
- "version": "9.2.6",
+ "version": "9.2.7",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "f6293e1b30a2354e8428e004689671b83871edde"
+ "reference": "d4c798ed8d51506800b441f7a13ecb0f76f12218"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f6293e1b30a2354e8428e004689671b83871edde",
- "reference": "f6293e1b30a2354e8428e004689671b83871edde",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/d4c798ed8d51506800b441f7a13ecb0f76f12218",
+ "reference": "d4c798ed8d51506800b441f7a13ecb0f76f12218",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-libxml": "*",
"ext-xmlwriter": "*",
- "nikic/php-parser": "^4.10.2",
+ "nikic/php-parser": "^4.12.0",
"php": ">=7.3",
"phpunit/php-file-iterator": "^3.0.3",
"phpunit/php-text-template": "^2.0.2",
@@ -23029,7 +23028,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
- "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.6"
+ "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.7"
},
"funding": [
{
@@ -23037,7 +23036,7 @@
"type": "github"
}
],
- "time": "2021-03-28T07:26:59+00:00"
+ "time": "2021-09-17T05:39:03+00:00"
},
{
"name": "phpunit/php-file-iterator",
@@ -23282,16 +23281,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "9.5.9",
+ "version": "9.5.10",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "ea8c2dfb1065eb35a79b3681eee6e6fb0a6f273b"
+ "reference": "c814a05837f2edb0d1471d6e3f4ab3501ca3899a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ea8c2dfb1065eb35a79b3681eee6e6fb0a6f273b",
- "reference": "ea8c2dfb1065eb35a79b3681eee6e6fb0a6f273b",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c814a05837f2edb0d1471d6e3f4ab3501ca3899a",
+ "reference": "c814a05837f2edb0d1471d6e3f4ab3501ca3899a",
"shasum": ""
},
"require": {
@@ -23307,7 +23306,7 @@
"phar-io/version": "^3.0.2",
"php": ">=7.3",
"phpspec/prophecy": "^1.12.1",
- "phpunit/php-code-coverage": "^9.2.3",
+ "phpunit/php-code-coverage": "^9.2.7",
"phpunit/php-file-iterator": "^3.0.5",
"phpunit/php-invoker": "^3.1.1",
"phpunit/php-text-template": "^2.0.3",
@@ -23369,7 +23368,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.9"
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.10"
},
"funding": [
{
@@ -23381,7 +23380,7 @@
"type": "github"
}
],
- "time": "2021-08-31T06:47:40+00:00"
+ "time": "2021-09-25T07:38:51+00:00"
},
{
"name": "raveren/kint",
@@ -24361,7 +24360,6 @@
"type": "github"
}
],
- "abandoned": true,
"time": "2020-09-28T06:45:17+00:00"
},
{
@@ -24748,12 +24746,12 @@
"source": {
"type": "git",
"url": "https://github.com/SU-SWS/blt-sws.git",
- "reference": "6666affc85e4c6080cc1375aa2afee1e0eeac459"
+ "reference": "6e16bd6aacc4d6fa13c371fa1206408b7410ae82"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/SU-SWS/blt-sws/zipball/6666affc85e4c6080cc1375aa2afee1e0eeac459",
- "reference": "6666affc85e4c6080cc1375aa2afee1e0eeac459",
+ "url": "https://api.github.com/repos/SU-SWS/blt-sws/zipball/6e16bd6aacc4d6fa13c371fa1206408b7410ae82",
+ "reference": "6e16bd6aacc4d6fa13c371fa1206408b7410ae82",
"shasum": ""
},
"require": {
@@ -24781,7 +24779,7 @@
"issues": "https://github.com/SU-SWS/blt-sws/issues",
"source": "https://github.com/SU-SWS/blt-sws/tree/main"
},
- "time": "2021-09-08T17:50:37+00:00"
+ "time": "2021-09-20T19:17:01+00:00"
},
{
"name": "su-sws/drupal-dev",
diff --git a/config/default/admin_toolbar.settings.yml b/config/default/admin_toolbar.settings.yml
new file mode 100644
index 000000000..5965a3170
--- /dev/null
+++ b/config/default/admin_toolbar.settings.yml
@@ -0,0 +1 @@
+menu_depth: 4
diff --git a/config/default/migrate_plus.migration.hs_d7_people.yml b/config/default/migrate_plus.migration.hs_d7_people.yml
index 5bda1cd10..730ae1f31 100644
--- a/config/default/migrate_plus.migration.hs_d7_people.yml
+++ b/config/default/migrate_plus.migration.hs_d7_people.yml
@@ -204,7 +204,7 @@ process:
source: researchArea
-
plugin: str_replace
- search: ';'
+ search: ;
replace: '|'
-
plugin: explode