Merge pull request #724 from City-of-Helsinki/update-configuration

Automatic update
City-of-Helsinki · Nov 20, 2023 · 2b101b8 · 2b101b8
2 parents 066510f + 2ddf0b2
commit 2b101b8
Show file tree

Hide file tree

Showing 29 changed files with 65 additions and 38 deletions.
diff --git a/conf/cmi/editor.editor.full_html.yml b/conf/cmi/editor.editor.full_html.yml
@@ -42,6 +42,9 @@ settings:
         - heading4
         - heading5
         - heading6
+    ckeditor5_list:
+      reversed: false
+      startIndex: true
     ckeditor5_sourceEditing:
       allowed_tags:
         - '<dl>'
@@ -60,16 +63,13 @@ settings:
         - '<h6 id>'
         - '<figure tabindex>'
         - '<figcaption>'
-    ckeditor5_list:
-      reversed: false
-      startIndex: true
-    linkit_extension:
-      linkit_enabled: true
-      linkit_profile: helfi
     helfi_ckeditor_helfi_link:
       helfi_link_attributes:
         - '<a aria-label class data-design data-hds-icon-start data-is-external data-link-text data-protocol data-selected-icon data-hds-component data-hds-variant id rel role target="_blank" title>'
         - '<span aria-hidden class role>'
+    linkit_extension:
+      linkit_enabled: true
+      linkit_profile: helfi
 image_upload:
   status: false
   scheme: public

diff --git a/conf/cmi/editor.editor.minimal.yml b/conf/cmi/editor.editor.minimal.yml
@@ -24,22 +24,22 @@ settings:
       - '|'
       - sourceEditing
   plugins:
+    ckeditor5_list:
+      reversed: false
+      startIndex: true
     ckeditor5_sourceEditing:
       allowed_tags:
         - '<span role aria-* class>'
         - '<ul type>'
         - '<ol type>'
         - '<a hreflang accesskey id rel target title data-design data-link-text data-selected-icon data-is-external data-protocol>'
-    ckeditor5_list:
-      reversed: false
-      startIndex: true
-    linkit_extension:
-      linkit_enabled: true
-      linkit_profile: helfi
     helfi_ckeditor_helfi_link:
       helfi_link_attributes:
         - '<a aria-label class data-design data-hds-icon-start data-is-external data-link-text data-protocol data-selected-icon data-hds-component data-hds-variant id rel role target="_blank" title>'
         - '<span aria-hidden class role>'
+    linkit_extension:
+      linkit_enabled: true
+      linkit_profile: helfi
 image_upload:
   status: false
   scheme: public

diff --git a/conf/cmi/field.field.media.helfi_chart.field_helfi_chart_transcript.yml b/conf/cmi/field.field.media.helfi_chart.field_helfi_chart_transcript.yml
@@ -24,5 +24,6 @@ required: true
 translatable: false
 default_value: {  }
 default_value_callback: ''
-settings: {  }
+settings:
+  allowed_formats: {  }
 field_type: text_long
diff --git a/conf/cmi/field.field.node.announcement.body.yml b/conf/cmi/field.field.node.announcement.body.yml
@@ -27,4 +27,5 @@ default_value_callback: ''
 settings:
   display_summary: false
   required_summary: false
+  allowed_formats: {  }
 field_type: text_with_summary
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/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.district_and_project_search.field_district_project_desc.yml b/conf/cmi/field.field.paragraph.district_and_project_search.field_district_project_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.district_listing.field_district_list_description.yml b/conf/cmi/field.field.paragraph.district_listing.field_district_list_description.yml
@@ -22,5 +22,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.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.journey_planner.field_description.yml b/conf/cmi/field.field.paragraph.journey_planner.field_description.yml
@@ -21,5 +21,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.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.project_listing.field_project_list_description.yml b/conf/cmi/field.field.paragraph.project_listing.field_project_list_description.yml
@@ -22,5 +22,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.remote_video.field_remote_video_description.yml b/conf/cmi/field.field.paragraph.remote_video.field_remote_video_description.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.remote_video.field_remote_video_video_desc.yml b/conf/cmi/field.field.paragraph.remote_video.field_remote_video_video_desc.yml
@@ -23,5 +23,6 @@ required: true
 translatable: false
 default_value: {  }
 default_value_callback: ''
-settings: {  }
+settings:
+  allowed_formats: {  }
 field_type: text_long
diff --git a/conf/cmi/field.field.paragraph.service_list.field_service_list_description.yml b/conf/cmi/field.field.paragraph.service_list.field_service_list_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.service_list_search.field_service_list_description.yml b/conf/cmi/field.field.paragraph.service_list_search.field_service_list_description.yml
@@ -23,5 +23,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.sidebar_text.field_sidebar_text_text.yml b/conf/cmi/field.field.paragraph.sidebar_text.field_sidebar_text_text.yml
@@ -22,5 +22,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.unit_search.field_unit_search_description.yml b/conf/cmi/field.field.paragraph.unit_search.field_unit_search_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/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