Skip to content

Commit

Permalink
Merge pull request #738 from City-of-Helsinki/dev
Browse files Browse the repository at this point in the history
Dev to main
  • Loading branch information
khalima authored Nov 6, 2024
2 parents 10ea37c + be9d880 commit 301b220
Show file tree
Hide file tree
Showing 16 changed files with 309 additions and 285 deletions.
2 changes: 1 addition & 1 deletion .platform/schema
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ services:
chromium:
# @todo Update this to newer version once minkphp supports Selenium 4.
# @see https://github.com/minkphp/MinkSelenium2Driver/pull/372
image: selenium/standalone-chrome:106.0
image: seleniarm/standalone-chromium:106.0
networks:
- internal
profiles:
Expand Down
1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
"drupal/openapi_jsonapi": "^3.0",
"drupal/openapi_ui_redoc": "^1.0@RC",
"drupal/radioactivity": "^4.0",
"drupal/raven": "^5.0",
"drupal/redis": "^1.5",
"drupal/search_api": "^1.23",
"drupal/ultimate_cron": "^2.0@alpha",
Expand Down
551 changes: 280 additions & 271 deletions composer.lock

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ id: linkedevents_event
label: 'LinkedEvents: Event'
label_plural: 'LinkedEvents: Events'
description: 'Event entities from https://api.hel.fi/linkedevents.'
generate_aliases: false
read_only: true
generate_aliases: false
field_mapper_id: jsonpath
field_mapper_config:
field_mappings:
Expand Down
18 changes: 9 additions & 9 deletions conf/cmi/raven.settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ client_key: ''
environment: ''
release: ''
log_levels:
1: 1
2: 2
3: 3
4: 4
5: 0
6: 0
7: 0
8: 0
emergency: true
alert: true
critical: true
error: true
warning: false
notice: false
info: false
debug: false
stack: true
timeout: 2.0
message_limit: 2048
trace: false
fatal_error_handler: false
fatal_error_handler: true
fatal_error_handler_memory: 2560
javascript_error_handler: false
drush_error_handler: true
Expand Down
2 changes: 2 additions & 0 deletions conf/cmi/user.role.admin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ dependencies:
- path
- pathauto
- publication_date
- raven
- redirect
- role_delegation
- scheduler
Expand Down Expand Up @@ -175,6 +176,7 @@ permissions:
- 'revert news_item revisions'
- 'revert page revisions'
- 'schedule publishing of nodes'
- 'send performance traces to sentry'
- 'set announcement published on date'
- 'set landing_page published on date'
- 'set news_article published on date'
Expand Down
1 change: 1 addition & 0 deletions conf/cmi/user.role.anonymous.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ permissions:
- 'restful get helfi_global_mobile_menu'
- 'restful get helfi_menu_link_collection'
- 'send javascript errors to sentry'
- 'send performance traces to sentry'
- 'view global_menu'
- 'view helfi_announcements external entity'
- 'view helfi_surveys external entity'
Expand Down
1 change: 1 addition & 0 deletions conf/cmi/user.role.authenticated.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ permissions:
- 'restful get helfi_global_mobile_menu'
- 'restful get helfi_menu_link_collection'
- 'send javascript errors to sentry'
- 'send performance traces to sentry'
- 'setup own tfa'
- 'view global_menu'
- 'view helfi_announcements external entity'
Expand Down
2 changes: 2 additions & 0 deletions conf/cmi/user.role.content_producer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ dependencies:
- paragraphs_library
- path
- publication_date
- raven
- scheduler
- system
- taxonomy
Expand Down Expand Up @@ -111,6 +112,7 @@ permissions:
- 'revert news_item revisions'
- 'revert page revisions'
- 'schedule publishing of nodes'
- 'send performance traces to sentry'
- 'set announcement published on date'
- 'set landing_page published on date'
- 'set news_article published on date'
Expand Down
2 changes: 2 additions & 0 deletions conf/cmi/user.role.editor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ dependencies:
- paragraphs_library
- path
- publication_date
- raven
- redirect
- scheduler
- system
Expand Down Expand Up @@ -143,6 +144,7 @@ permissions:
- 'revert news_item revisions'
- 'revert page revisions'
- 'schedule publishing of nodes'
- 'send performance traces to sentry'
- 'set announcement published on date'
- 'set landing_page published on date'
- 'set news_article published on date'
Expand Down
2 changes: 2 additions & 0 deletions conf/cmi/user.role.menu_api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ dependencies:
module:
- file
- helfi_global_navigation
- raven
- tfa
id: menu_api
label: 'Menu API'
Expand All @@ -14,5 +15,6 @@ permissions:
- 'create global_menu'
- 'delete own files'
- 'disable own tfa'
- 'send performance traces to sentry'
- 'setup own tfa'
- 'update global_menu'
2 changes: 2 additions & 0 deletions conf/cmi/user.role.news_producer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ dependencies:
- paragraphs_library
- path
- publication_date
- raven
- scheduler
- system
- tfa
Expand Down Expand Up @@ -69,6 +70,7 @@ permissions:
- 'revert news_article revisions'
- 'revert news_item revisions'
- 'schedule publishing of nodes'
- 'send performance traces to sentry'
- 'set news_article published on date'
- 'set news_item published on date'
- 'setup own tfa'
Expand Down
2 changes: 2 additions & 0 deletions conf/cmi/user.role.read_only.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ dependencies:
- file
- node
- paragraphs
- raven
- tfa
- toolbar
- view_unpublished
Expand All @@ -25,6 +26,7 @@ permissions:
- 'access toolbar'
- 'delete own files'
- 'disable own tfa'
- 'send performance traces to sentry'
- 'setup own tfa'
- 'view any unpublished announcement content'
- 'view any unpublished landing_page content'
Expand Down
2 changes: 2 additions & 0 deletions conf/cmi/user.role.survey_editor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ dependencies:
- content_translation
- node
- publication_date
- raven
_core:
default_config_hash: CliaTgzCQcvNF9ot3u_EbHnydymXh8bvNgNFlSffj9s
id: survey_editor
Expand All @@ -22,6 +23,7 @@ permissions:
- 'edit any survey content'
- 'edit own survey content'
- 'revert survey revisions'
- 'send performance traces to sentry'
- 'set survey published on date'
- 'translate survey node'
- 'view survey revisions'
2 changes: 1 addition & 1 deletion docker/openshift/crons/pubsub.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ echo "Running PubSub daemon: $(date +'%Y-%m-%dT%H:%M:%S%:z')"

while true
do
# PubSub process exists with success return code after
# PubSub process exits with success return code after
# certain number of messages and should then be restarted.
drush helfi:azure:pubsub-listen || exit 1
done

0 comments on commit 301b220

Please sign in to comment.