Merge branch 'f/OS-61_cache_control_override' into release/1.14.0

* f/OS-61_cache_control_override: OS-61 adding updating CHANGELOG OS-61 - dependency on cache_control_override, enabling on install # Conflicts: # CHANGELOG.md
OS2Forms · Oct 3, 2023 · 3ede86a · 3ede86a
2 parents dd37993 + 752ce79
commit 3ede86a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,8 @@ before starting to add changes.
 ## [Unreleased]
 
 - webform_embded remove
+- Adding cache_control_override as a soft dependency (composer only)
+- Installing cache_control_override module on hook_install
 
 ## [1.13.0] - 25.09.2023
 

diff --git a/composer.json b/composer.json
@@ -21,7 +21,8 @@
         "drupal/core": "^9",
         "drush/drush": "^11.4",
         "os2forms/os2forms": "^3.6",
-        "os2web/os2web_simplesaml": "8.x-dev"
+        "os2web/os2web_simplesaml": "8.x-dev",
+        "drupal/cache_control_override": "^1.1|^2.0"
     },
     "require-dev": {
         "drupal/coder": "^8.3",

diff --git a/os2forms_forloeb_profile.install b/os2forms_forloeb_profile.install
@@ -41,6 +41,9 @@ function os2forms_forloeb_profile_install() {
     ->set('default', 'gin')
     ->set('admin', 'gin')
     ->save();
+
+  // Enable recommended (but optional) modules.
+  \Drupal::service('module_installer')->install(['cache_control_override']);
 }
 
 /**