Skip to content

Commit

Permalink
Merge pull request #8 from cwrc/leaf_3.0.11_update
Browse files Browse the repository at this point in the history
Bump LEAF version to 3.0.11 from 3.0.10
  • Loading branch information
jefferya authored Sep 27, 2024
2 parents c5afd76 + d99f487 commit b0383e1
Show file tree
Hide file tree
Showing 6 changed files with 219 additions and 6 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,6 @@
/drush
/drupal.phar
/drupal

# Ignore
.swp
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ The CWRC Repository customizations include Drupal modules and configurations tha
docker buildx bake drupal-composer-helper --set "drupal.tags=ghcr.io/cwrc/drupal:local"
id=$(docker create "ghcr.io/cwrc/drupal:local")
docker cp $id:/var/www/drupal/composer.json docker/drupal/rootfs/var/www/drupal/
docker cp $id:/var/www/drupal/composer.lock /docker/drupal/rootfs/var/www/drupal/
docker cp $id:/var/www/drupal/composer.lock docker/drupal/rootfs/var/www/drupal/
docker rm -v $id
```

Expand Down
2 changes: 1 addition & 1 deletion docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ variable "REPOSITORY" {
# Not the one displayed on DockerHub.
# Variable names with '_TAG' and '_REPOSITORY' fail with docker/bake-action
variable "LEAF_VERSION" {
default = "3.0.10"
default = "3.0.11"
}
variable "LEAF_REGISTRY" {
default = "registry.gitlab.com/calincs/cwrc/leaf/leaf-base-i8"
Expand Down
14 changes: 11 additions & 3 deletions docker/drupal/rootfs/var/www/drupal/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@
"drupal/facets_date_range": "^1.0@beta",
"drupal/features": "^3.11",
"drupal/field_group": "*",
"drupal/field_hidden": "^2.1",
"drupal/field_permissions": "*",
"drupal/filefield_paths": "1.x-dev",
"drupal/fixed_block_content": "^1.1",
Expand Down Expand Up @@ -197,6 +198,7 @@
"drupal/pathauto": "^1.8",
"drupal/pdf": "^1.1",
"drupal/private_message": "^3.0",
"drupal/profile": "^1.10",
"drupal/profile_switcher": "^1.0@alpha",
"drupal/quickedit": "^1.0",
"drupal/quicktabs": "^3.0@alpha",
Expand Down Expand Up @@ -228,6 +230,7 @@
"drupal/views_field_view": "^1.0@beta",
"drupal/views_infinite_scroll": "^2.0",
"drupal/views_local_tasks": "^1.0",
"drupal/weight": "^3.4",
"drush/drush": "^12",
"islandora-rdm/islandora_fits": "dev-8.x-1.x",
"islandora/controlled_access_terms": "*",
Expand Down Expand Up @@ -373,7 +376,8 @@
"group_membership_duplication": "https://www.drupal.org/files/issues/2019-07-09/group_membership_duplication-3016197-10.patch",
"Use of static in callables is deprecated ": "https://www.drupal.org/files/issues/2023-07-25/3349565-6.patch",
"Revisions no longer work since Drupal 9.3": "https://www.drupal.org/files/issues/2024-02-29/revision-no-longer-works-3254038-23.patch",
"Add revisions tab on groups": "https://www.drupal.org/files/issues/2023-08-24/groups-have-two-revisions-tabs.patch"
"Add revisions tab on groups": "https://www.drupal.org/files/issues/2023-08-24/groups-have-two-revisions-tabs.patch",
"WSOD Error when editing group type permissions": "https://www.drupal.org/files/issues/2022-08-25/group-3294949-2.patch"
},
"drupal/bootstrap_barrio": {
"Missing library fix": "patches/bootstrap-barrio-file-library-fix.patch"
Expand All @@ -393,13 +397,14 @@
"drupal/core": {
"Parent menu exist check D10.2": "patches/core/parent_menu_exist.patch",
"PO file import error": "https://www.drupal.org/files/issues/2021-12-19/2449895_92.patch",
"Default value of selected options not working": "https://www.drupal.org/files/issues/2023-11-02/5220.patch"
"Default value of selected options not working": "https://www.drupal.org/files/issues/2023-11-02/5220.patch",
"RuntimeException: Adding non-existent permissions to a role is not allowed": "https://www.drupal.org/files/issues/2024-06-03/3358586-36.patch"
},
"drupal/quickedit": {
"Uncaught TypeError: _.where & _.pluck is not a function": "https://www.drupal.org/files/issues/2023-12-27/type-error-where-pluck-not-a-function-3410956-3.patch"
},
"drupal/social_link_field": {
"Can't create new Social Link field in Drupal 10": "https://www.drupal.org/files/issues/2024-02-15/social_link_field-3410562-6.patch"
"Multiple Icon Issues": "https://www.drupal.org/files/issues/2024-04-10/myPatch.diff"
},
"drupal/require_revision_log_message": {
"can this be made to work with media as well": "https://www.drupal.org/files/issues/2023-04-24/3293857-worksformedia-10.patch"
Expand All @@ -416,6 +421,9 @@
},
"drupal/layout_builder_perms": {
"Fix not valid context for entity context when editing the default layout entity types": "https://www.drupal.org/files/issues/2023-12-15/not_valid_context-3392780-reroll_patch_from_4-7_0.patch"
},
"drupal/profile": {
"Make Profiles Translatable": "https://www.drupal.org/files/issues/2021-02-10/2899744-40.patch"
}
},
"drupal-core-project-message": {
Expand Down
200 changes: 199 additions & 1 deletion docker/drupal/rootfs/var/www/drupal/composer.lock

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

Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ module:
features_ui: 0
field: 0
field_group: 0
field_hidden: 0
field_permissions: 0
field_ui: 0
file: 0
Expand All @@ -80,6 +81,7 @@ module:
geolocation: 0
getjwtonlogin: 0
gnode: 0
gprofile: 0
group: 0
group_content_menu: 0
groupmedia: 0
Expand Down Expand Up @@ -161,6 +163,7 @@ module:
prepopulate: 0
private_message: 0
private_message_notify: 0
profile: 0
quickedit: 0
quicktabs: 0
quicktabs_jqueryui: 0
Expand Down Expand Up @@ -211,6 +214,7 @@ module:
views_local_tasks: 0
views_show_more: 0
views_ui: 0
weight: 0
workflows: 0
ds: 1
pathauto: 1
Expand Down

0 comments on commit b0383e1

Please sign in to comment.