Skip to content

Commit 1cf054c

Browse files
authored
Merge pull request #1005 from City-of-Helsinki/UHF-12628
UHF-12628: Updated Group and Group content menu modules to 3.x
2 parents 2a654d0 + c6b257a commit 1cf054c

138 files changed

Lines changed: 634 additions & 1912 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

composer.json

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"cweagans/composer-patches": "^1.6.7",
1212
"drupal/better_exposed_filters": "^7.0",
1313
"drupal/flexible_permissions": "^2.0",
14-
"drupal/group": "^2.0",
15-
"drupal/group_content_menu": "^2.0",
14+
"drupal/group": "^3.0",
15+
"drupal/group_content_menu": "^3.0",
1616
"drupal/hdbt": "^6.0",
1717
"drupal/hdbt_admin": "^3.0",
1818
"drupal/helfi_azure_fs": "^2.0",
@@ -97,13 +97,7 @@
9797
},
9898
"patches": {
9999
"drupal/group": {
100-
"Prevent null when loading group membership roles (https://www.drupal.org/i/3197610)": "./patches/group-3197610_prevent_null_on_group_getroles.patch",
101-
"https://www.drupal.org/i/2815971": "./patches/2815971.patch",
102-
"Duplicate revision(version) tab around Group's admin pages": "https://www.drupal.org/files/issues/2023-12-12/group-revision-tabs-appear-twice-3397063-15.patch",
103-
"Fix for group relation type entity type definitions not available first cache rebuild after site install": "./patches/group_relation_type_entity_type_definitions_during_cache_rebuild.patch"
104-
},
105-
"drupal/group_content_menu": {
106-
"Fix for group_content_menu derivative definition load during first cache rebuild after site install": "./patches/group_content_menu_derivative_definition_load_during_cache_rebuild.patch"
100+
"https://www.drupal.org/i/2815971": "./patches/2815971.patch"
107101
},
108102
"drupal/override_node_options": {
109103
"Fix for adding non-existent permissions to a role is not allowed error during site install.": "patches/override_node_permissions_missing_dependencies.patch"

composer.lock

Lines changed: 16 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conf/cmi/core.base_field_override.group.upper_secondary_school.changed.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

conf/cmi/core.base_field_override.group.upper_secondary_school.created.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

conf/cmi/core.base_field_override.group.upper_secondary_school.label.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

conf/cmi/core.base_field_override.group.upper_secondary_school.metatag.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

conf/cmi/core.base_field_override.group.upper_secondary_school.path.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

conf/cmi/core.base_field_override.group.upper_secondary_school.status.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

conf/cmi/core.base_field_override.group.upper_secondary_school.uid.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

conf/cmi/core.base_field_override.group_content.group_content_type_5e8b00831189e.changed.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)