diff --git a/.gitignore b/.gitignore index 25435b0d37f184efb80b5493ca83bec868b90bab..96603e21f308030fbb99771fc5225fbf5c87acdd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,19 +1,13 @@ -.docker-init/ +console/ files/ passwords/ settings/ wiki/ -.ahoy.yml -.editorconfig -.env -docker-compose.yml # Ignore directories generated by Composer drush/cache/ drush/Commands/ drush/sites/ -tests/backstop/backstop_data/bitmaps_test -tests/backstop/backstop_data/html_report vendor/ web/core/ web/libraries/ @@ -31,6 +25,9 @@ web/sites/*/settings.local.php web/sites/*/files/ web/sites/*/private/ +# Ignore Docker files +docker-compose.yml + # Ignore files generated by PhpStorm .idea/ @@ -40,9 +37,3 @@ nbproject/ # Ignore MAC files */.DS_Store -/.gitattributes -settings.docker.php -drushrc.php -default.site.yml -drush.yml -wkhtmltox.sh diff --git a/composer.json b/composer.json index 5df95f8c7cd42d150ada881cd0355fdfe7a84b04..abec124fb407ad843d0810a53681e28bb5a064aa 100644 --- a/composer.json +++ b/composer.json @@ -54,6 +54,16 @@ "discard-changes": true }, "extra": { + "dorgflow": { + "projects": { + "drupal/drd": "4.0.x" + } + }, + "patches": { + "drupal/eva": { + "D9": "https://www.drupal.org/files/issues/2020-05-21/3042832-13.patch" + } + }, "composer-drupal-optimizations": { "require": { "symfony/symfony": ">=4.4"