Update configuration

City-of-Helsinki · Nov 15, 2023 · 9a37b7c · 9a37b7c
1 parent 389529d
commit 9a37b7c
Show file tree

Hide file tree

Showing 32 changed files with 252 additions and 130 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/field.field.paragraph.accordion.field_accordion_description.yml b/conf/cmi/field.field.paragraph.accordion.field_accordion_description.yml
@@ -24,5 +24,6 @@ required: false
 translatable: false
 default_value: {  }
 default_value_callback: ''
-settings: {  }
+settings:
+  allowed_formats: {  }
 field_type: text_long
diff --git a/...cmi/field.field.paragraph.after_school_activity_search.field_after_school_search_desc.yml b/...cmi/field.field.paragraph.after_school_activity_search.field_after_school_search_desc.yml
@@ -21,5 +21,6 @@ required: false
 translatable: false
 default_value: {  }
 default_value_callback: ''
-settings: {  }
+settings:
+  allowed_formats: {  }
 field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.banner.field_banner_desc.yml b/conf/cmi/field.field.paragraph.banner.field_banner_desc.yml
@@ -19,5 +19,6 @@ required: false
 translatable: false
 default_value: {  }
 default_value_callback: ''
-settings: {  }
+settings:
+  allowed_formats: {  }
 field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.chart.field_chart_description.yml b/conf/cmi/field.field.paragraph.chart.field_chart_description.yml
@@ -19,5 +19,6 @@ required: false
 translatable: false
 default_value: {  }
 default_value_callback: ''
-settings: {  }
+settings:
+  allowed_formats: {  }
 field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.contact_card_listing.field_description.yml b/conf/cmi/field.field.paragraph.contact_card_listing.field_description.yml
@@ -24,5 +24,6 @@ required: false
 translatable: false
 default_value: {  }
 default_value_callback: ''
-settings: {  }
+settings:
+  allowed_formats: {  }
 field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.daycare_search.field_daycare_search_description.yml b/conf/cmi/field.field.paragraph.daycare_search.field_daycare_search_description.yml
@@ -21,5 +21,6 @@ required: false
 translatable: false
 default_value: {  }
 default_value_callback: ''
-settings: {  }
+settings:
+  allowed_formats: {  }
 field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.event_list.field_event_list_description.yml b/conf/cmi/field.field.paragraph.event_list.field_event_list_description.yml
@@ -17,5 +17,6 @@ required: false
 translatable: false
 default_value: {  }
 default_value_callback: ''
-settings: {  }
+settings:
+  allowed_formats: {  }
 field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.group_news.field_group_news_description.yml b/conf/cmi/field.field.paragraph.group_news.field_group_news_description.yml
@@ -21,5 +21,6 @@ required: false
 translatable: false
 default_value: {  }
 default_value_callback: ''
-settings: {  }
+settings:
+  allowed_formats: {  }
 field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.hearings.field_hearings_description.yml b/conf/cmi/field.field.paragraph.hearings.field_hearings_description.yml
@@ -24,5 +24,6 @@ required: false
 translatable: false
 default_value: {  }
 default_value_callback: ''
-settings: {  }
+settings:
+  allowed_formats: {  }
 field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.hero.field_hero_desc.yml b/conf/cmi/field.field.paragraph.hero.field_hero_desc.yml
@@ -23,5 +23,6 @@ required: false
 translatable: false
 default_value: {  }
 default_value_callback: ''
-settings: {  }
+settings:
+  allowed_formats: {  }
 field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.high_school_search.field_hs_search_description.yml b/conf/cmi/field.field.paragraph.high_school_search.field_hs_search_description.yml
@@ -21,5 +21,6 @@ required: false
 translatable: false
 default_value: {  }
 default_value_callback: ''
-settings: {  }
+settings:
+  allowed_formats: {  }
 field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.liftup_with_image.field_liftup_with_image_desc.yml b/conf/cmi/field.field.paragraph.liftup_with_image.field_liftup_with_image_desc.yml
@@ -19,5 +19,6 @@ required: false
 translatable: false
 default_value: {  }
 default_value_callback: ''
-settings: {  }
+settings:
+  allowed_formats: {  }
 field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.map.field_map_description.yml b/conf/cmi/field.field.paragraph.map.field_map_description.yml
@@ -19,5 +19,6 @@ required: false
 translatable: false
 default_value: {  }
 default_value_callback: ''
-settings: {  }
+settings:
+  allowed_formats: {  }
 field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.news_list.field_news_list_description.yml b/conf/cmi/field.field.paragraph.news_list.field_news_list_description.yml
@@ -24,5 +24,6 @@ required: false
 translatable: false
 default_value: {  }
 default_value_callback: ''
-settings: {  }
+settings:
+  allowed_formats: {  }
 field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.phasing.field_description.yml b/conf/cmi/field.field.paragraph.phasing.field_description.yml
@@ -24,5 +24,6 @@ required: false
 translatable: true
 default_value: {  }
 default_value_callback: ''
-settings: {  }
+settings:
+  allowed_formats: {  }
 field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.phasing_item.field_description.yml b/conf/cmi/field.field.paragraph.phasing_item.field_description.yml
@@ -24,5 +24,6 @@ required: false
 translatable: true
 default_value: {  }
 default_value_callback: ''
-settings: {  }
+settings:
+  allowed_formats: {  }
 field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.playground_search.field_playground_search_desc.yml b/conf/cmi/field.field.paragraph.playground_search.field_playground_search_desc.yml
@@ -21,5 +21,6 @@ required: false
 translatable: false
 default_value: {  }
 default_value_callback: ''
-settings: {  }
+settings:
+  allowed_formats: {  }
 field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.school_search.field_comp_search_description.yml b/conf/cmi/field.field.paragraph.school_search.field_comp_search_description.yml
@@ -21,5 +21,6 @@ required: false
 translatable: false
 default_value: {  }
 default_value_callback: ''
-settings: {  }
+settings:
+  allowed_formats: {  }
 field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.sidebar_text.field_sidebar_text_text.yml b/conf/cmi/field.field.paragraph.sidebar_text.field_sidebar_text_text.yml
@@ -24,5 +24,6 @@ required: false
 translatable: false
 default_value: {  }
 default_value_callback: ''
-settings: {  }
+settings:
+  allowed_formats: {  }
 field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.target_group_links.field_target_group_links_desc.yml b/conf/cmi/field.field.paragraph.target_group_links.field_target_group_links_desc.yml
@@ -23,5 +23,6 @@ required: false
 translatable: false
 default_value: {  }
 default_value_callback: ''
-settings: {  }
+settings:
+  allowed_formats: {  }
 field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.text.field_text.yml b/conf/cmi/field.field.paragraph.text.field_text.yml
@@ -24,5 +24,6 @@ required: false
 translatable: false
 default_value: {  }
 default_value_callback: ''
-settings: {  }
+settings:
+  allowed_formats: {  }
 field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.vocational_school_search.field_vs_search_description.yml b/conf/cmi/field.field.paragraph.vocational_school_search.field_vs_search_description.yml
@@ -21,5 +21,6 @@ required: false
 translatable: false
 default_value: {  }
 default_value_callback: ''
-settings: {  }
+settings:
+  allowed_formats: {  }
 field_type: text_long
diff --git a/conf/cmi/language/fi/group.content_type.group_content_type_5e8b00831189e.yml b/conf/cmi/language/fi/group.content_type.group_content_type_5e8b00831189e.yml
diff --git a/conf/cmi/language/fi/group.content_type.group_content_type_8cf71fbe8b0c4.yml b/conf/cmi/language/fi/group.content_type.group_content_type_8cf71fbe8b0c4.yml
diff --git a/conf/cmi/language/fi/group.content_type.group_content_type_b0ee7f3e08749.yml b/conf/cmi/language/fi/group.content_type.group_content_type_b0ee7f3e08749.yml
diff --git a/conf/cmi/language/fi/group.content_type.group_content_type_c28cd27128f0f.yml b/conf/cmi/language/fi/group.content_type.group_content_type_c28cd27128f0f.yml
diff --git a/conf/cmi/language/fi/group.content_type.group_content_type_c5fd8986910a1.yml b/conf/cmi/language/fi/group.content_type.group_content_type_c5fd8986910a1.yml
diff --git a/conf/cmi/language/fi/group.content_type.group_content_type_cb62eb2a38c4f.yml b/conf/cmi/language/fi/group.content_type.group_content_type_cb62eb2a38c4f.yml
diff --git a/conf/cmi/language/fi/hdbt_admin_tools.site_settings.yml b/conf/cmi/language/fi/hdbt_admin_tools.site_settings.yml
@@ -1,4 +1,4 @@
 site_settings:
-  theme_color: metro
   default_icon: face-smile
+  theme_color: metro
   koro: pulse
diff --git a/conf/cmi/language/sv/hdbt_admin_tools.site_settings.yml b/conf/cmi/language/sv/hdbt_admin_tools.site_settings.yml
@@ -1,4 +1,4 @@
 site_settings:
-  theme_color: metro
   default_icon: face-smile
+  theme_color: metro
   koro: pulse
diff --git a/tools/commit-msg b/tools/commit-msg
@@ -4,12 +4,13 @@
 # feature/PROJECT-1234-test-test
 # PROJECT-1234-test-test
 # PROJECT-1234_test_test
+# fixup! (for git rebase --autosquash)
 id=$(echo `git rev-parse --abbrev-ref HEAD` | sed -nE 's|([a-z]+/)?([A-Z]+-[0-9]+)(-.+)?(_.+)?|\2|p')
 COMMIT_MESSAGE=$(cat $1)
 
 # Only prepare commit message if pattern matched and Jira ID was found and
 # message doesn't contain Jira ID already.
-if [[ ! -z $id ]] && [[ $COMMIT_MESSAGE != $id* ]]; then
+if [[ ! -z $id ]] && [[ $COMMIT_MESSAGE != $id* ]] && [[ $COMMIT_MESSAGE != "fixup!"* ]]; then
   # $1 is the name of the file containing the commit message
   # Prepend "ABCD-123: "
   sed -i.bak -E "1s/^/${id}: /" $1