From d1906789d5c816f3f844e38485a0c8f382f092f8 Mon Sep 17 00:00:00 2001 From: Bryan R Date: Mon, 23 Jan 2023 21:53:36 -0700 Subject: [PATCH 1/3] WS2-1530 - Blocked config management script temp files from repo; Reorganized .gitignore file --- .gitignore | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 3e1b3fe..b8f540b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1,28 @@ +# NodeJS projects !node_modules node_modules/* node_modules/@asu-design-system !node_modules/@asu-design-system node_modules/@asu-design-system/* -!node_modules/@asu-design-system/component-news -node_modules/@asu-design-system/component-news/* -!node_modules/@asu-design-system/component-news/dist -node_modules/@asu-design-system/component-news/dist/* -!node_modules/@asu-design-system/component-news/dist/news.production.js -!node_modules/@asu-design-system/component-news/dist/vendor.production.js -!node_modules/@asu-design-system/component-news/dist/asuNews.umd.js -!node_modules/@asu-design-system/component-news/dist/vendor.umd.js +!node_modules/@asu-design-system/component-events +node_modules/@asu-design-system/component-events/* +!node_modules/@asu-design-system/component-events/dist +node_modules/@asu-design-system/component-events/dist/* +!node_modules/@asu-design-system/component-events/dist/events.production.js +!node_modules/@asu-design-system/component-events/dist/vendor.production.js +!node_modules/@asu-design-system/component-events/dist/asuEvents.umd.js +!node_modules/@asu-design-system/component-events/dist/vendor.umd.js + +# 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 52a761cb3bd2b37b256b048dd078fd86c63b25b5 Mon Sep 17 00:00:00 2001 From: Bryan R Date: Mon, 23 Jan 2023 21:54:10 -0700 Subject: [PATCH 2/3] WS2-1530 - Refreshed one config file (after upstream Drupal update changed YMLs) --- config/install/field.field.block_content.news.field_display.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/install/field.field.block_content.news.field_display.yml b/config/install/field.field.block_content.news.field_display.yml index eb7c59a..277e598 100644 --- a/config/install/field.field.block_content.news.field_display.yml +++ b/config/install/field.field.block_content.news.field_display.yml @@ -19,4 +19,4 @@ default_value: value: Cards default_value_callback: '' settings: { } -field_type: list_string \ No newline at end of file +field_type: list_string From 49e46cf98f7e2e089ae3194ad5cfd61c92272151 Mon Sep 17 00:00:00 2001 From: Bryan R Date: Thu, 2 Mar 2023 18:10:00 -0700 Subject: [PATCH 3/3] WS2-1530 - Blocked script-generated files from repo --- .gitignore | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index b8f540b..9da284a 100644 --- a/.gitignore +++ b/.gitignore @@ -21,8 +21,8 @@ node_modules/@asu-design-system/component-events/dist/* .idea/ # Config management script output -/config/_config_changes.diff +/config/_*changes.diff /config/**/_diff_commands.bash -*APPLY.patch -.DS_Store* - +*APPLICABLE.patch +.DS_Store +.DS_Stor*