Merge branch 'main' into domain-warmup-migrations

Author: sam-lord

apps/admin-x-settings/src/components/settings/advanced/labs/PrivateFeatures.tsx

@@ -47,6 +47,10 @@ const features: Feature[] = [{
     title: 'New Admin Experience',
     description: 'Try the new React-based admin interface. Only available on ghost.io',
     flag: 'adminForward'
+}, {
+    title: 'Domain Warmup',
+    description: 'Enable custom sending domain warmup for gradual email volume increases',
+    flag: 'domainWarmup'
 }];
 
 const AlphaFeatures: React.FC = () => {

ghost/core/core/shared/labs.js

@@ -51,7 +51,8 @@ const PRIVATE_FEATURES = [
     'utmTracking',
     'emailUniqueid',
     'welcomeEmails',
-    'adminForward'
+    'adminForward',
+    'domainWarmup'
 ];
 
 module.exports.GA_KEYS = [...GA_FEATURES];

ghost/core/test/e2e-api/admin/__snapshots__/config.test.js.snap

@@ -16,6 +16,7 @@ Object {
       "contentVisibility": true,
       "contentVisibilityAlpha": true,
       "customFonts": true,
+      "domainWarmup": true,
       "editorExcerpt": true,
       "emailCustomization": true,
       "emailUniqueid": true,