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 #270

Merged
merged 1 commit into from
Jan 8, 2024
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
2 changes: 1 addition & 1 deletion .platform/schema
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4
5
3 changes: 3 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@
"drush/Commands/{$name}": [
"type:drupal-drush"
]
},
"patchLevel": {
"drupal/core": "-p2"
}
},
"autoload-dev": {
Expand Down
306 changes: 153 additions & 153 deletions composer.lock

Large diffs are not rendered by default.

17 changes: 15 additions & 2 deletions conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,17 @@ dependencies:
- field.field.tpr_unit.tpr_unit.field_metatags
- field.field.tpr_unit.tpr_unit.field_unit_type
module:
- allowed_formats
- hdbt_admin_tools
- helfi_tpr
- media_library
- metatag
- paragraphs
- path
- readonly_field_widget
- text
_core:
default_config_hash: iGJgv-B14-RUdc8dyC_MKfM3icDg5Cae4kFwC0MjyGQ
default_config_hash: ilRrdsHOQ6StmQoz8EXvQCOoYTo8L_o2ZG8gNzEbtZM
id: tpr_unit.tpr_unit.default
targetEntityType: tpr_unit
bundle: tpr_unit
Expand Down Expand Up @@ -54,7 +56,7 @@ content:
third_party_settings: { }
address:
type: readonly_field_widget
weight: 19
weight: 20
region: content
settings:
label: above
Expand Down Expand Up @@ -112,6 +114,17 @@ content:
formatter_settings: { }
show_description: false
third_party_settings: { }
enrich_description:
type: text_textarea
weight: 19
region: content
settings:
rows: 5
placeholder: ''
third_party_settings:
allowed_formats:
hide_help: '1'
hide_guidelines: '1'
field_content:
type: paragraphs
weight: 28
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies:
- telephone
- text
_core:
default_config_hash: 7xcZTrrfS31z_AAdwrXSDrgd2PAqTWFPgY-XoAEjXQ0
default_config_hash: SoKM8cPSwNeMsP8ZRG0b8B8n-e1Uy9yoMmPk018vmoY
id: tpr_unit.tpr_unit.default
targetEntityType: tpr_unit
bundle: tpr_unit
Expand Down Expand Up @@ -103,6 +103,13 @@ content:
third_party_settings: { }
weight: 8
region: content
enrich_description:
type: text_default
label: hidden
settings: { }
third_party_settings: { }
weight: 3
region: content
field_content:
type: entity_reference_revisions_entity_view
label: hidden
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies:
- address
- helfi_tpr
_core:
default_config_hash: wvPWnthIC7o8oa1gJ6jI0ex6xi12GVsZEN5zyrlCLoU
default_config_hash: f5AGkO_5_TgZ9InGKOLMyzbGFaCCTKeiPJYeGuTLnq0
id: tpr_unit.tpr_unit.minimal
targetEntityType: tpr_unit
bundle: tpr_unit
Expand Down Expand Up @@ -52,6 +52,7 @@ hidden:
created: true
description: true
email: true
enrich_description: true
field_content: true
field_lower_content: true
field_metatags: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies:
- helfi_tpr
- imagecache_external
_core:
default_config_hash: 8hru5uh55ouZ9y4kV_EEJ6PEjb2rGY_tFUc_3Sn12M0
default_config_hash: 6HvSNKVwbTTTZp-QqRhArKx-A-rx42QloU6l9LZG9rQ
id: tpr_unit.tpr_unit.teaser
targetEntityType: tpr_unit
bundle: tpr_unit
Expand Down Expand Up @@ -72,6 +72,7 @@ hidden:
created: true
description: true
email: true
enrich_description: true
field_content: true
field_lower_content: true
field_metatags: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies:
- imagecache_external
- telephone
_core:
default_config_hash: gOlhIa1n9jTIJdBPN_Kjp-jn3YnsvZb7HELaoqa8KGQ
default_config_hash: 7gCaVLldtjbDLtOqHqBK6K1NqvNzluQEbJG5bn945k4
id: tpr_unit.tpr_unit.teaser_with_image
targetEntityType: tpr_unit
bundle: tpr_unit
Expand Down Expand Up @@ -73,6 +73,7 @@ hidden:
created: true
description: true
email: true
enrich_description: true
field_content: true
field_lower_content: true
field_metatags: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies:
- imagecache_external
- telephone
_core:
default_config_hash: 25YiuMfsdqG-daKeTND6nbYvwDgt7kE7bw23g2GyteI
default_config_hash: 0wDMf9-yI6dKb0je5d0tNyKMNCX5FmuYbFxMRzGs1kc
id: tpr_unit.tpr_unit.wide_teaser
targetEntityType: tpr_unit
bundle: tpr_unit
Expand Down Expand Up @@ -88,6 +88,7 @@ hidden:
created: true
description: true
email: true
enrich_description: true
field_content: true
field_lower_content: true
field_metatags: true
Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ services:
SIMPLETEST_BASE_URL: "http://app:8888"
SIMPLETEST_DB: "mysql://drupal:drupal@db:3306/drupal"
BROWSERTEST_OUTPUT_BASE_URL: "https://${DRUPAL_HOSTNAME}"
BROWSERTEST_OUTPUT_DIRECTORY: "/app/public/sites/default/files/simpletest"
DRUPAL_VARNISH_HOST: "${COMPOSE_PROJECT_NAME}-varnish"
DRUPAL_VARNISH_PORT: 6081
REDIS_HOST: redis
Expand Down