Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automatic update #724

Merged
merged 1 commit into from
Nov 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions conf/cmi/editor.editor.full_html.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ settings:
- heading4
- heading5
- heading6
ckeditor5_list:
reversed: false
startIndex: true
ckeditor5_sourceEditing:
allowed_tags:
- '<dl>'
Expand All @@ -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
Expand Down
12 changes: 6 additions & 6 deletions conf/cmi/editor.editor.minimal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@ required: true
translatable: false
default_value: { }
default_value_callback: ''
settings: { }
settings:
allowed_formats: { }
field_type: text_long
1 change: 1 addition & 0 deletions conf/cmi/field.field.node.announcement.body.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,5 @@ default_value_callback: ''
settings:
display_summary: false
required_summary: false
allowed_formats: { }
field_type: text_with_summary
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
settings: { }
settings:
allowed_formats: { }
field_type: text_long
3 changes: 2 additions & 1 deletion conf/cmi/field.field.paragraph.banner.field_banner_desc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
settings: { }
settings:
allowed_formats: { }
field_type: text_long
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
settings: { }
settings:
allowed_formats: { }
field_type: text_long
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
settings: { }
settings:
allowed_formats: { }
field_type: text_long
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
settings: { }
settings:
allowed_formats: { }
field_type: text_long
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
settings: { }
settings:
allowed_formats: { }
field_type: text_long
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
settings: { }
settings:
allowed_formats: { }
field_type: text_long
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
settings: { }
settings:
allowed_formats: { }
field_type: text_long
3 changes: 2 additions & 1 deletion conf/cmi/field.field.paragraph.hero.field_hero_desc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
settings: { }
settings:
allowed_formats: { }
field_type: text_long
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,6 @@ required: false
translatable: true
default_value: { }
default_value_callback: ''
settings: { }
settings:
allowed_formats: { }
field_type: text_long
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
settings: { }
settings:
allowed_formats: { }
field_type: text_long
3 changes: 2 additions & 1 deletion conf/cmi/field.field.paragraph.map.field_map_description.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
settings: { }
settings:
allowed_formats: { }
field_type: text_long
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
settings: { }
settings:
allowed_formats: { }
field_type: text_long
3 changes: 2 additions & 1 deletion conf/cmi/field.field.paragraph.phasing.field_description.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@ required: false
translatable: true
default_value: { }
default_value_callback: ''
settings: { }
settings:
allowed_formats: { }
field_type: text_long
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@ required: false
translatable: true
default_value: { }
default_value_callback: ''
settings: { }
settings:
allowed_formats: { }
field_type: text_long
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
settings: { }
settings:
allowed_formats: { }
field_type: text_long
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
settings: { }
settings:
allowed_formats: { }
field_type: text_long
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,6 @@ required: true
translatable: false
default_value: { }
default_value_callback: ''
settings: { }
settings:
allowed_formats: { }
field_type: text_long
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
settings: { }
settings:
allowed_formats: { }
field_type: text_long
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,6 @@ required: false
translatable: true
default_value: { }
default_value_callback: ''
settings: { }
settings:
allowed_formats: { }
field_type: text_long
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
settings: { }
settings:
allowed_formats: { }
field_type: text_long
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
settings: { }
settings:
allowed_formats: { }
field_type: text_long
3 changes: 2 additions & 1 deletion conf/cmi/field.field.paragraph.text.field_text.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
settings: { }
settings:
allowed_formats: { }
field_type: text_long
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@ required: false
translatable: false
default_value: { }
default_value_callback: ''
settings: { }
settings:
allowed_formats: { }
field_type: text_long
3 changes: 2 additions & 1 deletion tools/commit-msg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down