Merge branch 'D9-upgrade' of gitlab.com:agaric/sites/agaric-com into D9-upgrade

This commit is contained in:
David Valdez 2020-08-28 21:18:31 -05:00
commit 2a08038d1a
3 changed files with 23 additions and 20 deletions

37
.ddev/.gitignore vendored
View file

@ -1,24 +1,27 @@
#ddev-generated: Automatically generated ddev .gitignore.
# You can remove the above line if you want to edit and maintain this file yourself.
/commands/*/*.example
/commands/*/README.txt
/commands/host/launch
/commands/web/xdebug
/commands/db/mysql
/homeadditions/*.example
/homeadditions/README.txt
/.gitignore
/import.yaml
/**/*.example
/.dbimageBuild
/.dbimageExtra
/.ddev-docker-compose-base.yaml
/.ddev-docker-compose-full.yaml
/db_snapshots
/sequelpro.spf
/import-db
/config.*.y*ml
/.webimageBuild
/.dbimageBuild
/.ddevlive-downloads
/.global_commands
/.homeadditions
/.sshimageBuild
/.webimageBuild
/.webimageExtra
/.dbimageExtra
/*-build/Dockerfile.example
/apache/apache-site.conf
/commands/.gitattributes
/commands/db/mysql
/commands/host/launch
/commands/web/live
/commands/web/xdebug
/config.*.y*ml
/db_snapshots
/import-db
/import.yaml
/nginx_full/nginx-site.conf
/sequelpro.spf
/**/README.*

View file

@ -2,7 +2,7 @@ APIVersion: v1.13.1
name: agaric-coop
type: drupal8
docroot: web
php_version: "7.2"
php_version: "7.3"
webserver_type: nginx-fpm
router_http_port: "80"
router_https_port: "443"

View file

@ -15,7 +15,7 @@
"drupal/ckeditor_markdown": "^1.1",
"drupal/coffee": "1.x-dev",
"drupal/comment_notify": "dev-1.x",
"drupal/core-recommended": "^8.8",
"drupal/core-recommended": "^9",
"drupal/customerror": "1.x-dev",
"drupal/diff": "^1.0@RC",
"drupal/dropdown_language": "^2.2",
@ -53,7 +53,7 @@
"drupal/webform_mailchimp": "^5.4",
"drupal/wysiwyg_linebreaks": "1.x-dev",
"drush/drush": "^10.0",
"drutopia/drutopia": "^1.0-beta1",
"drutopia/drutopia": "^1.x-dev",
"wikimedia/composer-merge-plugin": "^1.4",
"zaporylie/composer-drupal-optimizations": "^1.0"
},