Merge pull request #379 from UN-OCHA/develop

Deploy 18-10-2023
UN-OCHA · Oct 18, 2023 · 81ad419 · 81ad419
2 parents 38a9a0e + 043ba54
commit 81ad419
Show file tree

Hide file tree

Showing 24 changed files with 1,171 additions and 396 deletions.
diff --git a/PATCHES/pathauto-php-82-compatibility.patch b/PATCHES/pathauto-php-82-compatibility.patch
diff --git a/composer.lock b/composer.lock
diff --git a/composer.patches.json b/composer.patches.json
@@ -17,9 +17,6 @@
     "drupal/maintenance200": {
       "Drupal 10 compatibility": "PATCHES/maintenance200-drupal-10-compatibility.patch"
     },
-    "drupal/pathauto": {
-      "PHP 8.2 compatibility": "PATCHES/pathauto-php-82-compatibility.patch"
-    },
     "drupal/stage_file_proxy": {
       "Stage file proxy attempts to fetch aggregated JS/CSS": "PATCHES/stage_file_proxy_3372105.patch"
     },

diff --git a/html/themes/custom/common_design_subtheme/.gitignore b/html/themes/custom/common_design_subtheme/.gitignore
@@ -1,7 +1,9 @@
 # dev files
 **/node_modules/
-**/.sass-cache/
-**/*.css.map
+
+# puppeteer
+.cache
+**/coverage
 
 # mac stuff
 **/.DS_Store