Merge pull request #788 from dof-dss/development

1.0.3 release

Author: omahm

Diff for: .circleci/config.yml

@@ -84,14 +84,6 @@ commands:
           command: |
             cd /home/circleci/project/web
             cp -f robots_nidirect.txt robots.txt
-  rename_healthcheck_file:
-    description: "Renames the healthcheck.php file with a uuid to prevent filename guessing"
-    steps:
-      - run:
-          name: Rename healthcheck file
-          command: |
-            cd /home/circleci/project/web
-            mv -f healthcheck.php hc_$HEALTHCHECK_ID.php
 
 jobs:
   # Tests the integrity of the build, stores the results in a workspace for re-use in later jobs.
@@ -103,7 +95,6 @@ jobs:
       - install_php_os_extensions
       - composer_tasks
       - update_robots_dot_txt
-      - rename_healthcheck_file
       - persist_to_workspace:
           root: ./
           paths:
@@ -125,7 +116,6 @@ jobs:
             composer require dof-dss/nidirect-site-modules:dev-development dof-dss/nidirect-migrations:dev-development \
               dof-dss/nidirect-d8-test-install-profile:dev-development dof-dss/nicsdru_origins_theme:dev-development \
               dof-dss/nicsdru_origins_modules:dev-development dof-dss/nicsdru_nidirect_theme:dev-development
-      - update_robots_dot_txt
       - persist_to_workspace:
           root: ./
           paths:
@@ -309,6 +299,7 @@ jobs:
 
             # Pause for webhook to propagate the change from GH to PSH.
             sleep 10s
+      - update_robots_dot_txt
       - run:
           name: Activate the environment if not found.
           command: |
@@ -362,7 +353,7 @@ jobs:
           name: Enable test user accounts
           command: |
             for username in nw_test_admin nw_test_apps nw_test_authenticated nw_test_author nw_test_editor nw_test_gp_author nw_test_gp_super nw_test_news_super nw_test_super; do
-              /home/circleci/.platformsh/bin/platform environment:drush user:unblock $username
+              /home/circleci/.platformsh/bin/platform environment:drush user:unblock $username -p $PLATFORM_PROJECT_ID -e $EDGE_BUILD_BRANCH
             done
       - run:
           name: Force purge of Solr index

Diff for: composer.lock

@@ -94,6 +94,7 @@ module:
   nidirect_cold_weather_payments: 0
   nidirect_common: 0
   nidirect_contacts: 0
+  nidirect_dblog: 0
   nidirect_driving_instructors: 0
   nidirect_errorpages: 0
   nidirect_gp: 0

Diff for: config/sync/core.extension.yml

@@ -8,7 +8,7 @@ title: 'Remove expired log messages and flood control events'
 id: dblog_cron
 weight: 0
 module: dblog
-callback: dblog_cron
+callback: nidirect_dblog_cron
 scheduler:
   id: simple
 launcher:

Diff for: config/sync/ultimate_cron.job.dblog_cron.yml

@@ -58,7 +58,7 @@ elements: |
     '#type': webform_actions
     '#title': 'Submit button(s)'
     '#submit__label': 'Submit enquiry'
-  
+
 css: ''
 javascript: ''
 settings:
@@ -149,7 +149,7 @@ settings:
   draft_pending_multiple_message: ''
   confirmation_type: page
   confirmation_title: 'Thank you'
-  confirmation_message: '<p class="info-notice info-notice--success">We aim to get back to you within 10 to 14 working days with a response or update on your enquiry.</p>'
+  confirmation_message: '<p class="info-notice info-notice--success">PRONI aims to respond to your enquiry within 20 working days of receipt.</p>'
   confirmation_url: ''
   confirmation_attributes: {  }
   confirmation_back: true
@@ -279,4 +279,4 @@ handlers:
       theme_name: ''
       parameters: {  }
       exclude_attachments: false
-variants: {  }
+variants: {  }

Diff for: config/sync/webform.webform.proni_submit_an_enquiry.yml

@@ -408,7 +408,7 @@ settings:
   draft_loaded_message: ''
   draft_pending_single_message: ''
   draft_pending_multiple_message: ''
-  confirmation_type: page
+  confirmation_type: message
   confirmation_title: 'Thank you for your feedback'
   confirmation_message: |
     <p class="nodeSummary">If you have asked for a reply, we aim to get back to you within 10 working days.</p>

Diff for: config/sync/webform.webform.site_feedback.yml

@@ -436,13 +436,12 @@ elements: |
         - ':input[name="do_you_want_a_reply_options"]':
             checked: true
     '#submit__label': 'Send feedback'
-
 css: ''
 javascript: ''
 settings:
-  ajax: true
+  ajax: false
   ajax_scroll_top: form
-  ajax_progress_type: throbber
+  ajax_progress_type: ''
   ajax_effect: ''
   ajax_speed: null
   page: true
@@ -523,13 +522,9 @@ settings:
   draft_loaded_message: ''
   draft_pending_single_message: ''
   draft_pending_multiple_message: ''
-  confirmation_type: inline
+  confirmation_type: message
   confirmation_title: ''
-  confirmation_message: |
-    <div class="info-notice info-notice--success">
-    <p><strong>Thank you for your feedback</strong></p>
-    </div>
-
+  confirmation_message: 'Thank you for your feedback'
   confirmation_url: ''
   confirmation_attributes: {  }
   confirmation_back: false
@@ -569,6 +564,11 @@ settings:
   wizard_toggle_hide_label: ''
   results_customize: false
   token_view: false
+  form_disable_remote_addr: false
+  wizard_auto_forward_hide_next_button: false
+  wizard_keyboard: true
+  token_delete: false
+  serial_disabled: false
 access:
   create:
     roles:
@@ -643,7 +643,6 @@ handlers:
 
         Submitted values are:
         [webform_submission:values]
-
       excluded_elements: {  }
       ignore_access: false
       exclude_empty: true