Merge branch 'development'

dof-dss · Nov 11, 2020 · 8981d8e · 8981d8e
2 parents 625acdd + 9a2f957
commit 8981d8e
Show file tree

Hide file tree

Showing 51 changed files with 786 additions and 174 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -317,6 +317,14 @@ jobs:
           name: Trigger a data sync from master environment to nightly edge build.
           command: |
             /home/circleci/.platformsh/bin/platform sync data -p $PLATFORM_PROJECT_ID -e $EDGE_BUILD_BRANCH -y
+      - run:
+          name: Turn off fastly module to allow for cleaner config import
+          command: |
+            /home/circleci/.platformsh/bin/platform environment:drush pmu fastly -y -p $PLATFORM_PROJECT_ID -e $EDGE_BUILD_BRANCH
+      - run:
+          name: Refresh configuration as our db will contain active prod config after sync operation
+          command: |
+            /home/circleci/.platformsh/bin/platform environment:drush cim -y -p $PLATFORM_PROJECT_ID -e $EDGE_BUILD_BRANCH
       - run:
           name: Force purge of Solr index
           command: /home/circleci/.platformsh/bin/platform ssh -p $PLATFORM_PROJECT_ID -e $EDGE_BUILD_BRANCH "curl http://${PLATFORM_SOLR_HOST}/solr/default/update --data '<delete><query>*:*</query></delete>' -H 'Content-type:text/xml; charset=utf-8' && curl http://${PLATFORM_SOLR_HOST}/solr/default/update --data '<commit/>' -H 'Content-type:text/xml; charset=utf-8'"

diff --git a/.platform/solr_config/synonyms_en.txt b/.platform/solr_config/synonyms_en.txt
@@ -1,3 +1,6 @@
+NI => Northern Ireland
 GRONI,General Register Office for Northern Ireland
-DVLNI,DVA,Driver and Vehicle Agency
-Access NI, AccessNI
+DVLNI => Driver and Vehicle Agency
+DVA => Driver and Vehicle Agency
+Access NI, AccessNI
+Roads Service => DfI Roads
diff --git a/.platform/solr_config/synonyms_und.txt b/.platform/solr_config/synonyms_und.txt
@@ -1,3 +1,6 @@
+NI => Northern Ireland
 GRONI,General Register Office for Northern Ireland
-DVLNI,DVA,Driver and Vehicle Agency
-Access NI, AccessNI
+DVLNI => Driver and Vehicle Agency
+DVA => Driver and Vehicle Agency
+Access NI, AccessNI
+Roads Service => DfI Roads
diff --git a/composer.json b/composer.json
@@ -42,8 +42,8 @@
         "drupal/admin_toolbar": "^2.0",
         "drupal/adminimal_theme": "^1.5",
         "drupal/better_field_descriptions": "^1.5",
-        "drupal/block_blacklist": "^1.0",
         "drupal/block_content_permissions": "^1.10",
+        "drupal/block_list_override": "^1.0",
         "drupal/chosen": "^3.0",
         "drupal/chosen_lib": "^3.0",
         "drupal/clientside_validation": "^2.0",
@@ -77,6 +77,7 @@
         "drupal/layout_builder_modal": "^1.0@alpha",
         "drupal/layout_builder_restrictions": "^2.2",
         "drupal/linkit": "^5.0",
+        "drupal/media_library_edit": "^1.0@alpha",
         "drupal/metatag": "^1.8",
         "drupal/migrate_upgrade": "^3.2",
         "drupal/moderation_sidebar": "^1.3",
@@ -151,6 +152,9 @@
                 "Prevent error when saving unpublished content for users without manage book privileges": "https://www.drupal.org/files/issues/2918537-36.patch",
                 "[PP-1] Provide options to sanitize filenames (transliterate, lowercase, replace whitespace, etc)": "https://www.drupal.org/files/issues/2019-12-06/2492171-294.patch"
             },
+            "drupal/media_library_edit": {
+                "Open in modal": "https://www.drupal.org/files/issues/2020-11-03/open-in-modal-3034205-48.patch"
+            },
             "drupal/easy_install": {
                 "Handle missing core version": "https://www.drupal.org/files/issues/2019-12-19/easy_install_core_version-3101883-0.patch"
             },