Skip to content

Commit

Permalink
Merge branch '8.0.18-release' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
pookmish committed Feb 20, 2019
2 parents bc184f1 + 2f45ac6 commit 7e71dac
Show file tree
Hide file tree
Showing 152 changed files with 3,405 additions and 1,199 deletions.
8 changes: 5 additions & 3 deletions blt/src/Commands/HumsciServerCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ public function humsciLetsEncryptAdd($environment = 'dev', $options = ['domains'
$this->say('Existing domains on the cert:' . PHP_EOL . implode(PHP_EOL, $domains));

if (!empty($options['domains'])) {
$this->say('Adding domains: '. implode(', ', $options['domains']));
$this->say('Adding domains: ' . implode(', ', $options['domains']));
$domains = array_merge($domains, $options['domains']);
}

Expand Down Expand Up @@ -283,10 +283,12 @@ public function humsciLetsEncryptGet($environment = 'dev') {
/**
* Changes necessary configuration and adds the domain to the LE Cert.
*
* @command humsci:launch-site
*
* @param string $site
* The machine name of the site.
*
* @command humsci:launch-site
*
* @throws \Robo\Exception\TaskException
*/
public function launchSite($site) {
$new_domain = preg_replace('/[^a-z]/', '-', $site);
Expand Down
6 changes: 4 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,11 @@
"drupal/bricks": "dev-1.x",
"drupal/bugherdapi": "^1.1",
"drupal/chosen": "~2.4",
"drupal/ckeditor_fixed_toolbar": "1.x-dev",
"drupal/color_field": "~2.0-rc2",
"drupal/components": "~1.0",
"drupal/conditional_fields": "^1.0@alpha",
"drupal/config_ignore": "^2.1",
"drupal/config_ignore": "dev-2.x#2b1740411fd1eb8bb139711be5e10535c40ddbbf",
"drupal/config_import_de": "^1.0@alpha",
"drupal/config_installer": "^1.8",
"drupal/config_readonly": "dev-1.x",
Expand Down Expand Up @@ -178,6 +179,7 @@
"drupal/smart_trim": "^1.1",
"drupal/taxonomy_menu_ui": "^1.0@beta",
"drupal/ui_patterns": "~1.0@RC",
"drupal/ultimate_cron": "^2.0@alpha",
"drupal/video_embed_field": "~2.0-alpha1",
"drupal/viewfield": "^3.0@alpha",
"drupal/views_block_filter_block": "^1.0@beta",
Expand Down Expand Up @@ -276,7 +278,7 @@
"Simplify Field Samples": "patches/contrib/core-simplify-samples.patch"
},
"drupal/config_ignore": {
"https://www.drupal.org/project/config_ignore/issues/2857247": "https://www.drupal.org/files/issues/2018-04-19/support-for-export-2857247-18.patch"
"https://www.drupal.org/project/config_ignore/issues/2857247": "https://www.drupal.org/files/issues/2018-10-14/support-for-export-2857247-24.patch"
},
"drupal/menu_block": {
"https://www.drupal.org/project/menu_block/issues/2809699": "https://www.drupal.org/files/issues/2018-05-07/menu_block-label_configuration-2809699-77.patch"
Expand Down
Loading

0 comments on commit 7e71dac

Please sign in to comment.