Merge branch '2.4' into 2.5

silverstripe · Nov 17, 2019 · a47aa4c · a47aa4c
2 parents c344179 + ca4799a
commit a47aa4c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/_config/security.yml b/app/_config/security.yml
@@ -10,11 +10,11 @@ Except:
 # See https://www.cwp.govt.nz/developer-docs/en/2/working_with_projects/security/
 # See https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Strict-Transport-Security
 CWP\Core\Control\InitialisationMiddleware:
-  strict_transport_security: 'max-age: 300'
+  strict_transport_security: 'max-age=300'
 # Configure SSL redirection for every route (override default ForceSSLPatterns).
 # Required for the HSTS configuration above to take effect.
 SilverStripe\Core\Injector\Injector:
   SilverStripe\Control\Middleware\CanonicalURLMiddleware:
     properties:
       ForceSSL: true
-      ForceSSLPatterns: null
+      ForceSSLPatterns: null
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         "cwp/cwp-recipe-search": "2.5.x-dev",
         "silverstripe/recipe-services": "1.5.x-dev",
         "silverstripe/subsites": "2.3.x-dev",
-        "tractorcow/silverstripe-fluent": "4.2.x-dev",
+        "tractorcow/silverstripe-fluent": "4.4.x-dev",
         "silverstripe/registry": "2.2.x-dev",
         "cwp/starter-theme": "3.0.x-dev"
     },