Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
################
# GitLabCI template for Drupal projects.
################

include:
- project: $_GITLAB_TEMPLATES_REPO
ref: $_GITLAB_TEMPLATES_REF
file:
- '/includes/include.drupalci.main.yml'
- '/includes/include.drupalci.variables.yml'
- '/includes/include.drupalci.workflows.yml'
#
################
# Pipeline configuration variables are defined with default values and descriptions in the file
# https://git.drupalcode.org/project/gitlab_templates/-/blob/main/includes/include.drupalci.variables.yml
################
variables:
SKIP_CSPELL: "1"
OPT_IN_TEST_MAX_PHP: 1
OPT_IN_TEST_PREVIOUS_MAJOR: 1
OPT_IN_TEST_NEXT_MAJOR: 1


2 changes: 2 additions & 0 deletions localgov_core.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ dependencies:

test_dependencies:
- paragraphs:paragraphs
- paragraphs:paragraphs_library
- localgov_core:localgov_media_test_config
3 changes: 3 additions & 0 deletions modules/localgov_media/localgov_media.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,6 @@ dependencies:
- drupal:responsive_image
- image_widget_crop:image_widget_crop
- linkit:linkit

test_dependencies:
- localgov_core:localgov_media_test_config
2 changes: 1 addition & 1 deletion src/Service/DefaultBlockInstaller.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ protected function blockDefinitions(string $module): array {
*/
protected function targetThemes(): array {

$themes = ['localgov_base', 'localgov_scarfolk'];
$themes = ['localgov_base', 'localgov_scarfolk', 'localgov_microsites_base'];

$activeTheme = $this->getActiveThemeName();
if ($activeTheme && !in_array($activeTheme, $themes, TRUE)) {
Expand Down