Skip to content

Commit

Permalink
Merge pull request #534 from UN-OCHA/deploy-20250219
Browse files Browse the repository at this point in the history
Deploy 19-02-2025
  • Loading branch information
lazysoundsystem authored Feb 18, 2025
2 parents 9e5665c + 5ef4a36 commit d6c1c47
Show file tree
Hide file tree
Showing 16 changed files with 381 additions and 1,001 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,20 @@
All notable changes to this project will be documented in this file.
<!--- END HEADER -->

## [9.7.11](https://github.com/UN-OCHA/gms-site/compare/v9.7.10...v9.7.11) (2025-02-18)

### Chores

* Bump block_class to supported version 4. ([3fd3e9](https://github.com/UN-OCHA/gms-site/commit/3fd3e99e693dc258f834e9cd68e192ba095e454f))
* Oops. Drop the codemirror editor settings. ([1a44e2](https://github.com/UN-OCHA/gms-site/commit/1a44e235de5f0f8fbffafed550c795d92a90918b))
* Remove codemirror_editor sensor config. ([75ec1f](https://github.com/UN-OCHA/gms-site/commit/75ec1fbec6afd6bc8ba2923a14c7b90e82d4bc27))
* Remove component_library module and dependencies (entity, js-cookie) it has. ([05bddb](https://github.com/UN-OCHA/gms-site/commit/05bddbf0627e6137e2ae5f67fc9ebf6e1f7f6e3e))
* Remove config_filter module ([b4e068](https://github.com/UN-OCHA/gms-site/commit/b4e068f52a4f5c6f8081de7d84832fd1e1d81052))
* Remove patch and update user_expire module ([bc781c](https://github.com/UN-OCHA/gms-site/commit/bc781cc2a4b1d90db65331a2f111e5bf517bd042))
* Uninstall entity and js_cookie modules, as component_library which they need is gone. ([fccdd2](https://github.com/UN-OCHA/gms-site/commit/fccdd29f90cc27bab53c30fc5da3713a2f3d31b2))
* Uninstall the codemirror_editor module. ([88822c](https://github.com/UN-OCHA/gms-site/commit/88822caf8902e7f66983247eade323250720cba1))
* Update all outdated drupal/* unocha/* drush/* weitzman/drupal-test-traits packages. ([b30c8d](https://github.com/UN-OCHA/gms-site/commit/b30c8d68a1be500633d510b8320cd64d5f83c488), [eda682](https://github.com/UN-OCHA/gms-site/commit/eda682c847ae07bd47e1460cb10fcae5814809cc), [df417f](https://github.com/UN-OCHA/gms-site/commit/df417f461b56c011ca19bf34824d00b820d545d9), [48e33e](https://github.com/UN-OCHA/gms-site/commit/48e33ed0635cb410253edef7d611fa376854636a))

## [9.7.10](https://github.com/UN-OCHA/gms-site/compare/v9.7.9...v9.7.10) (2025-01-14)

### Chores
Expand Down
17 changes: 0 additions & 17 deletions PATCHES/3416368-error-not-caught-extra.patch

This file was deleted.

18 changes: 0 additions & 18 deletions PATCHES/3416368-error-not-caught-queue.patch

This file was deleted.

90 changes: 0 additions & 90 deletions PATCHES/3416368-error-not-caught.patch

This file was deleted.

23 changes: 23 additions & 0 deletions PATCHES/amazon_ses-cron-queue-3417090-8.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
diff --git a/amazon_ses.module b/amazon_ses.module
new file mode 100644
index 0000000..b778644
--- /dev/null
+++ b/amazon_ses.module
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * @file
+ * Hooks for the amazon_ses module.
+ */
+
+/**
+ * Implements hook_queue_info_alter().
+ */
+function amazon_ses_queue_info_alter(&$queues) {
+ $enabled = \Drupal::config('amazon_ses.settings')->get('queue');
+
+ if (!$enabled && isset($queues['amazon_ses_mail_queue']['cron'])) {
+ unset($queues['amazon_ses_mail_queue']['cron']);
+ }
+}
179 changes: 0 additions & 179 deletions PATCHES/user_expire/customize-notification-email.patch

This file was deleted.

10 changes: 4 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
}
],
"require": {
"php": ">=8.2",
"php": ">=8.3",
"ckeditor-plugin/colorbutton": "^4.11",
"ckeditor-plugin/fakeobjects": "^4.16.2",
"ckeditor-plugin/iframe": "^4.16.2",
Expand All @@ -108,15 +108,13 @@
"drupal/auto_config_form": "^1.0",
"drupal/aws": "dev-2.0.x",
"drupal/back_to_top": "^3.0",
"drupal/block_class": "^2.0",
"drupal/block_class": "^4",
"drupal/ckeditor_config": "^3.1",
"drupal/ckeditor_font": "^1.2",
"drupal/ckeditor_iframe": "^2.1",
"drupal/colorbutton": "^1.3",
"drupal/component_library": "^1.0.0-alpha",
"drupal/components": "^3.0@beta",
"drupal/conditional_fields": "^4.0@alpha",
"drupal/config_filter": "^2",
"drupal/config_split": "^2.0",
"drupal/config_update": "^2.0@alpha",
"drupal/contact_storage": "^1.2",
Expand Down Expand Up @@ -171,7 +169,7 @@
"drupal/token": "^1.9",
"drupal/token_filter": "^2.0",
"drupal/tome": "^1.4",
"drupal/user_expire": "^1.0",
"drupal/user_expire": "^2",
"drupal/username_enumeration_prevention": "^1.3",
"drupal/userprotect": "^1.1",
"drupal/video_embed_field": "^2.4",
Expand Down Expand Up @@ -310,5 +308,5 @@
"@git-hooks"
]
},
"version": "9.7.10"
"version": "9.7.11"
}
Loading

0 comments on commit d6c1c47

Please sign in to comment.