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

Merged
merged 1 commit into from
Mar 20, 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 @@
5
6
1 change: 0 additions & 1 deletion docker-compose.yml → compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ services:
# Use drush server to run functional tests, so we don't have to care about
# permission or SSL issues.
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"
Expand Down
36 changes: 20 additions & 16 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 20 additions & 20 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 @@ -177,6 +177,16 @@ content:
sidebar: false
use_details: true
third_party_settings: { }
field_ontologyword_details:
type: readonly_field_widget
weight: 40
region: content
settings:
label: above
formatter_type: null
formatter_settings: { }
show_description: false
third_party_settings: { }
field_unit_type:
type: entity_reference_autocomplete
weight: 30
Expand Down Expand Up @@ -374,6 +384,16 @@ content:
formatter_settings: { }
show_description: false
third_party_settings: { }
subgroup:
type: readonly_field_widget
weight: 40
region: content
settings:
label: above
formatter_type: null
formatter_settings: { }
show_description: false
third_party_settings: { }
toc_enabled:
type: boolean_checkbox
weight: 3
Expand Down Expand Up @@ -422,26 +442,6 @@ content:
formatter_settings: { }
show_description: false
third_party_settings: { }
field_ontologyword_details:
type: readonly_field_widget
weight: 40
region: content
settings:
label: above
formatter_type: null
formatter_settings: { }
show_description: false
third_party_settings: { }
subgroup:
type: readonly_field_widget
weight: 40
region: content
settings:
label: above
formatter_type: null
formatter_settings: { }
show_description: false
third_party_settings: { }
hidden:
created: true
field_categories: true
Expand Down
28 changes: 14 additions & 14 deletions conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,13 @@ content:
third_party_settings: { }
weight: 17
region: content
field_ontologyword_details:
type: tpr_ontologyword_details_formatter
label: hidden
settings: { }
third_party_settings: { }
weight: 28
region: content
highlights:
type: tpr_connection
label: hidden
Expand Down Expand Up @@ -261,6 +268,13 @@ content:
third_party_settings: { }
weight: 16
region: content
subgroup:
type: tpr_connection
label: hidden
settings: { }
third_party_settings: { }
weight: 32
region: content
toc_enabled:
type: boolean
label: hidden
Expand Down Expand Up @@ -297,20 +311,6 @@ content:
third_party_settings: { }
weight: 12
region: content
field_ontologyword_details:
type: tpr_ontologyword_details_formatter
label: hidden
settings: { }
third_party_settings: { }
weight: 28
region: content
subgroup:
type: tpr_connection
label: hidden
settings: { }
third_party_settings: { }
weight: 32
region: content
hidden:
created: true
field_categories: true
Expand Down
2 changes: 1 addition & 1 deletion tools/make/docker.mk
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CLI_SERVICE := app
CLI_SHELL := sh
# Note: specification says this file would be compose.yaml
DOCKER_COMPOSE_YML_PATH ?= docker-compose.yml
DOCKER_COMPOSE_YML_PATH ?= compose.yaml
DOCKER_COMPOSE_YML_EXISTS := $(shell test -f $(DOCKER_COMPOSE_YML_PATH) && echo yes || echo no)
DOCKER_PROJECT_ROOT ?= /app
DOCKER_WARNING_INSIDE := You are inside the Docker container!
Expand Down