From 791fa7d854acf8f13f8c7fa47e145a6197a8b8af Mon Sep 17 00:00:00 2001 From: Bryan R Date: Mon, 23 Jan 2023 21:34:20 -0700 Subject: [PATCH 1/2] WS2-1530 - Blocked config management script temp files from repo; Reorganized .gitignore file --- .gitignore | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0840e93..ed96625 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,14 @@ .history/ .cache -node_modules/.cache +# NodeJS projects +## Top-level +node_modules/.cache node_modules/* !node_modules/@asu-design-system node_modules/@asu-design-system/* + +## Per project - asu_brand !node_modules/@asu-design-system/component-cookie-consent/ node_modules/@asu-design-system/component-cookie-consent/* !node_modules/@asu-design-system/component-cookie-consent/dist @@ -12,6 +16,14 @@ node_modules/@asu-design-system/component-cookie-consent/* node_modules/@asu-design-system/component-header/* !node_modules/@asu-design-system/component-header/dist +# Drupal/external libraries /vendor/ +# PHPStorm (IDE) configurations .idea/ + +# Config management script output +/config/_config_changes.diff +/config/**/_diff_commands.bash +*APPLY.patch +.DS_Store* From 3ce381454c183a2cf069a2f19e2123cec56ef165 Mon Sep 17 00:00:00 2001 From: Bryan R Date: Thu, 2 Mar 2023 17:21:57 -0700 Subject: [PATCH 2/2] WS2-1530 - Reapplied cleanup of YMLs; Added .gitignore --- .gitignore | 4 ++-- config/install/asu_brand.settings.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ed96625..fb38404 100644 --- a/.gitignore +++ b/.gitignore @@ -23,7 +23,7 @@ node_modules/@asu-design-system/component-header/* .idea/ # Config management script output -/config/_config_changes.diff +/config/_*changes.diff /config/**/_diff_commands.bash -*APPLY.patch +*APPLICABLE.patch .DS_Store* diff --git a/config/install/asu_brand.settings.yml b/config/install/asu_brand.settings.yml index 7203d00..9b61e3d 100644 --- a/config/install/asu_brand.settings.yml +++ b/config/install/asu_brand.settings.yml @@ -1,6 +1,6 @@ asu_brand: asu_brand_cookie_consent_enabled: true - asu_brand_universal_gtm_id: 'GTM-KDWN8Z' + asu_brand_universal_gtm_id: GTM-KDWN8Z asu_brand_gtm_enabled: true - asu_brand_extra_gtm_id: + asu_brand_extra_gtm_id: '' asu_brand_search_url: 'https://search.asu.edu/search'