agaric/agaric-coop
10
1
Fork 0
Code Issues 102 Pull requests Projects Releases Packages Wiki Activity

Merge branch 'update-drupal-drutopia' into 'master'

Browse source 
Update drupal & drutopia

See merge request agaric/sites/agaric-com!17
This commit is contained in:
Clayton Dewey 2018-10-12 20:50:57 +00:00
commit 1dd24be3fd
4 changed files with 1305 additions and 2252 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
README.md
View file

@ -21,6 +21,11 @@ git submodule update
To be able to import the configuration, you need to get the initializing database (where we will also be collaborating on content) [from the test site](https://agaric-test.drutopia.org/) pending resolution of [drutopia#216](https://gitlab.com/drutopia/drutopia/issues/216). To be able to import the configuration, you need to get the initializing database (where we will also be collaborating on content) [from the test site](https://agaric-test.drutopia.org/) pending resolution of [drutopia#216](https://gitlab.com/drutopia/drutopia/issues/216).
```
vagrant ssh
composer install
drush -y sql-dump > /tmp/paranoia.sql && drush sql-drop && drush -y sql-sync @test @self && drush -y updb
```
### Get updates ### Get updates

37
composer.json
View file

@ -6,21 +6,24 @@
"minimum-stability": "dev", "minimum-stability": "dev",
"prefer-stable": true, "prefer-stable": true,
"require": { "require": {
"composer/installers": "^1.0",
"drupal-composer/drupal-scaffold": "^2.0.0",
"cweagans/composer-patches": "^1.0",
"drutopia/drutopia": "^1.0-alpha7",
"drupal/core": "^8.6.0",
"behat/behat": "^3.4", "behat/behat": "^3.4",
"drupal/drupal-extension": "^3.3",
"behat/mink": "^1.7", "behat/mink": "^1.7",
"behat/mink-goutte-driver": "^1.2", "behat/mink-goutte-driver": "^1.2",
"drush/drush": "^8.0", "composer/installers": "^1.0",
"cweagans/composer-patches": "^1.0",
"drupal-composer/drupal-scaffold": "^2.0.0",
"drupal/core": "^8.6.0",
"drutopia/drutopia": "dev-8.x-1.x",
"drupal/drutopia_core": "1.x-dev",
"drupal/drutopia_resource": "1.x-dev",
"drush/drush": "^9.0",
"drupal/migrate_tools": "^4.0", "drupal/migrate_tools": "^4.0",
"drupal/migrate_plus": "^4.0", "drupal/migrate_plus": "^4.0",
"drupal/webform": "^5.0@RC", "drupal/webform": "^5.0@RC",
"drupal/wysiwyg_linebreaks": "^1.9", "drupal/wysiwyg_linebreaks": "^1.9",
"drupal/redirect": "^1.2" "drupal/redirect": "^1.2",
"drupal/block_theme_sync": "^1.0@alpha",
"drupal/search404": "^1.0"
}, },
"repositories": { "repositories": {
"drupal": { "drupal": {
@ -38,6 +41,11 @@
], ],
"post-update-cmd": [ "post-update-cmd": [
"DrupalComposer\\DrupalScaffold\\Plugin::scaffold" "DrupalComposer\\DrupalScaffold\\Plugin::scaffold"
],
"nuke": "rm -rf vendor web/core web/modules/contrib web/profiles/contrib drush/contrib",
"quick-start": [
"composer install",
"php docroot/core/scripts/drupal quick-start drutopia --no-interaction"
] ]
}, },
"extra": { "extra": {
@ -57,11 +65,12 @@
"drush/contrib/{$name}": [ "drush/contrib/{$name}": [
"type:drupal-drush" "type:drupal-drush"
] ]
} },
}, "enable-patching": true,
"require-dev": { "patches": {
"phpunit/phpunit": "^6", "drupal/search404": {
"symfony/phpunit-bridge": "*", "Remove search module dependency": "https://www.drupal.org/files/issues/2018-07-09/search404-core-search-dependency-9.patch"
"mikey179/vfsstream": "~1.2" }
}
} }
} }

3513
composer.lock generated
View file

File diff suppressed because it is too large Load diff

2
web/themes/custom/agarica/patternlibrary

@ -1 +1 @@
Subproject commit a4ac0a4945519d3b24b523227e5b102bd83cf751 Subproject commit 8e9d186c96e3f54b7870cbbaaa1922d829481e04