code · pull · Apr 20, 2026 · Apr 20, 2026 · Apr 20, 2026 · Apr 20, 2026
diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml
@@ -9,11 +9,22 @@ concurrency:
   group: ci-release-${{ github.ref_name }}
   cancel-in-progress: false
 
+# Workflow-level permissions set the ceiling for the reusable ci.yml.
+# id-token is never in the default token, so it must be granted explicitly
+# here — otherwise the ci: job's `permissions:` block exceeds the caller
+# workflow's permissions and GitHub rejects the run with startup_failure.
+permissions:
+  actions: read
+  contents: write
+  packages: write
+  id-token: write
+
 jobs:
   ci:
     uses: ./.github/workflows/ci.yml
     secrets: inherit
     permissions:
+      actions: read
       contents: write
       packages: write
       id-token: write
diff --git a/.github/workflows/cleanup-stripe-test-accounts.yml b/.github/workflows/cleanup-stripe-test-accounts.yml
diff --git a/apps/admin-x-settings/src/components/settings/advanced/labs/private-features.tsx b/apps/admin-x-settings/src/components/settings/advanced/labs/private-features.tsx
@@ -55,10 +55,6 @@ const features: Feature[] = [{
     title: 'Drip Sequences',
     description: 'Enable welcome email drip sequences',
     flag: 'dripSequences'
-}, {
-    title: 'Welcome Emails Design Customization',
-    description: 'Enable design customization options for welcome emails',
-    flag: 'welcomeEmailsDesignCustomization'
 }, {
     title: 'Picture Element',
     description: 'Use the HTML picture element to serve modern image formats (AVIF, WebP) with automatic fallbacks',

diff --git a/apps/admin-x-settings/src/components/settings/membership/member-emails.tsx b/apps/admin-x-settings/src/components/settings/membership/member-emails.tsx
@@ -3,7 +3,6 @@ import React, {useEffect, useRef} from 'react';
 import TopLevelGroup from '../../top-level-group';
 import WelcomeEmailCustomizeModal from './member-emails/welcome-email-customize-modal';
 import WelcomeEmailModal from './member-emails/welcome-email-modal';
-import useFeatureFlag from '../../../hooks/use-feature-flag';
 import useQueryParams from '../../../hooks/use-query-params';
 import {APIError} from '@tryghost/admin-x-framework/errors';
 import {Button, ConfirmationModal, Icon, Table, TableRow, Toggle, showToast, withErrorBoundary} from '@tryghost/admin-x-design-system';
@@ -133,7 +132,6 @@ const MemberEmailsTable: React.FC<{
 };
 
 const MemberEmails: React.FC<{ keywords: string[] }> = ({keywords}) => {
-    const hasDesignCustomization = useFeatureFlag('welcomeEmailsDesignCustomization');
     const {settings, config} = useGlobalData();
     const [siteTitle] = getSettingValues<string>(settings, ['title']);
     const verifyEmailToken = useQueryParams().getParam('verifyEmail');
@@ -274,19 +272,18 @@ const MemberEmails: React.FC<{ keywords: string[] }> = ({keywords}) => {
     // Get email to display (existing or default for preview)
     const freeEmailForDisplay = freeWelcomeEmail || getDefaultWelcomeEmailRecord('free', siteTitle);
     const paidEmailForDisplay = paidWelcomeEmail || getDefaultWelcomeEmailRecord('paid', siteTitle);
-    const customizeButton = hasDesignCustomization ? (
-        <Button
-            className='mt-[-5px]'
-            color='clear'
-            label='Customize'
-            size='sm'
-            onClick={() => NiceModal.show(WelcomeEmailCustomizeModal)}
-        />
-    ) : null;
 
     return (
         <TopLevelGroup
-            customButtons={customizeButton}
+            customButtons={(
+                <Button
+                    className='mt-[-5px]'
+                    color='clear'
+                    label='Customize'
+                    size='sm'
+                    onClick={() => NiceModal.show(WelcomeEmailCustomizeModal)}
+                />
+            )}
             description="Create and manage automated emails for your members"
             keywords={keywords}
             navid='memberemails'

diff --git a/apps/admin-x-settings/test/acceptance/membership/member-welcome-emails.test.ts b/apps/admin-x-settings/test/acceptance/membership/member-welcome-emails.test.ts
@@ -45,23 +45,12 @@ const configWithTenorEnabled = {
     }
 };
 
-const configWithWelcomeEmailCustomization = {
+const managedEmailConfigWithoutSendingDomain = {
     ...responseFixtures.config,
     config: {
         ...responseFixtures.config.config,
-        labs: {
-            ...responseFixtures.config.config.labs,
-            welcomeEmailsDesignCustomization: true
-        }
-    }
-};
-
-const managedEmailConfigWithoutSendingDomain = {
-    ...configWithWelcomeEmailCustomization,
-    config: {
-        ...configWithWelcomeEmailCustomization.config,
         hostSettings: {
-            ...configWithWelcomeEmailCustomization.config.hostSettings,
+            ...responseFixtures.config.config.hostSettings,
             managedEmail: {
                 enabled: true
             }
@@ -656,7 +645,7 @@ test.describe('Member emails settings', async () => {
                 ...globalDataRequests,
                 browseSettings: {...globalDataRequests.browseSettings, response: settingsWithPublicationIcon},
                 ...newslettersRequest,
-                browseConfig: {method: 'GET', path: '/config/', response: configWithWelcomeEmailCustomization},
+                browseConfig: {method: 'GET', path: '/config/', response: responseFixtures.config},
                 browseAutomatedEmails: {method: 'GET', path: '/automated_emails/', response: automatedEmailsFixture},
                 readAutomatedEmailDesign: {method: 'GET', path: '/automated_emails/design/', response: automatedEmailDesignFixture},
                 editAutomatedEmailDesign: {method: 'PUT', path: '/automated_emails/design/', response: automatedEmailDesignFixture},
@@ -699,7 +688,7 @@ test.describe('Member emails settings', async () => {
             await mockApi({page, requests: {
                 ...globalDataRequests,
                 ...newslettersRequest,
-                browseConfig: {method: 'GET', path: '/config/', response: configWithWelcomeEmailCustomization},
+                browseConfig: {method: 'GET', path: '/config/', response: responseFixtures.config},
                 browseAutomatedEmails: {method: 'GET', path: '/automated_emails/', response: automatedEmailsFixture},
                 readAutomatedEmailDesign: {method: 'GET', path: '/automated_emails/design/', response: automatedEmailDesignFixture}
             }});
@@ -722,7 +711,7 @@ test.describe('Member emails settings', async () => {
             await mockApi({page, requests: {
                 ...globalDataRequests,
                 ...newslettersRequest,
-                browseConfig: {method: 'GET', path: '/config/', response: configWithWelcomeEmailCustomization},
+                browseConfig: {method: 'GET', path: '/config/', response: responseFixtures.config},
                 browseAutomatedEmails: {method: 'GET', path: '/automated_emails/', response: automatedEmailsFixture},
                 readAutomatedEmailDesign: {method: 'GET', path: '/automated_emails/design/', response: automatedEmailDesignFixture}
             }});
@@ -763,7 +752,7 @@ test.describe('Member emails settings', async () => {
             await mockApi({page, requests: {
                 ...globalDataRequests,
                 browseNewslettersLimit: {method: 'GET', path: '/newsletters/?filter=status%3Aactive&limit=1', response: newsletterReplyToNewsletterResponse},
-                browseConfig: {method: 'GET', path: '/config/', response: configWithWelcomeEmailCustomization},
+                browseConfig: {method: 'GET', path: '/config/', response: responseFixtures.config},
                 browseAutomatedEmails: {method: 'GET', path: '/automated_emails/', response: automatedEmailsFixture},
                 readAutomatedEmailDesign: {method: 'GET', path: '/automated_emails/design/', response: automatedEmailDesignFixture}
             }});
@@ -799,7 +788,7 @@ test.describe('Member emails settings', async () => {
             await mockApi({page, requests: {
                 ...globalDataRequests,
                 browseNewslettersLimit: {method: 'GET', path: '/newsletters/?filter=status%3Aactive&limit=1', response: newsletterCustomReplyToResponse},
-                browseConfig: {method: 'GET', path: '/config/', response: configWithWelcomeEmailCustomization},
+                browseConfig: {method: 'GET', path: '/config/', response: responseFixtures.config},
                 browseAutomatedEmails: {method: 'GET', path: '/automated_emails/', response: automatedEmailsFixture},
                 readAutomatedEmailDesign: {method: 'GET', path: '/automated_emails/design/', response: automatedEmailDesignFixture}
             }});
@@ -860,7 +849,7 @@ test.describe('Member emails settings', async () => {
             const {lastApiRequests} = await mockApi({page, requests: {
                 ...globalDataRequests,
                 ...newslettersRequest,
-                browseConfig: {method: 'GET', path: '/config/', response: configWithWelcomeEmailCustomization},
+                browseConfig: {method: 'GET', path: '/config/', response: responseFixtures.config},
                 browseAutomatedEmails: {method: 'GET', path: '/automated_emails/', response: automatedEmailsFixture},
                 readAutomatedEmailDesign: {method: 'GET', path: '/automated_emails/design/', response: automatedEmailDesignFixture},
                 editAutomatedEmailDesign: {method: 'PUT', path: '/automated_emails/design/', response: automatedEmailDesignFixture},

diff --git a/e2e/tests/admin/settings/member-welcome-emails.test.ts b/e2e/tests/admin/settings/member-welcome-emails.test.ts
@@ -160,10 +160,8 @@ test.describe('Ghost Admin - Member Welcome Emails', () => {
     });
 });
 
-test.describe('Ghost Admin - Welcome Email Customize Button - flag enabled', () => {
-    test.use({labs: {welcomeEmailsDesignCustomization: true}});
-
-    test('customize button opens modal when labs flag is enabled', async ({page}) => {
+test.describe('Ghost Admin - Welcome Email Customize Button', () => {
+    test('customize button opens modal', async ({page}) => {
         const welcomeEmailsSection = new MemberWelcomeEmailsSection(page);
 
         await welcomeEmailsSection.goto();
@@ -375,16 +373,6 @@ test.describe('Ghost Admin - Welcome Email Customize Button - flag enabled', ()
     });
 });
 
-test.describe('Ghost Admin - Welcome Email Customize Button - flag disabled', () => {
-    test('customize button is hidden when labs flag is disabled', async ({page}) => {
-        const welcomeEmailsSection = new MemberWelcomeEmailsSection(page);
-
-        await welcomeEmailsSection.goto();
-
-        await expect(welcomeEmailsSection.customizeButton).toBeHidden();
-    });
-});
-
 test.describe('Ghost Admin - Paid Member Welcome Emails', () => {
     test.use({stripeEnabled: true});
 

diff --git a/ghost/admin/package.json b/ghost/admin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ghost-admin",
-  "version": "6.32.0-rc.0",
+  "version": "6.33.0-rc.0",
   "description": "Ember.js admin client for Ghost",
   "author": "Ghost Foundation",
   "homepage": "http://ghost.org",

diff --git a/ghost/core/content/themes/casper b/ghost/core/content/themes/casper
diff --git a/ghost/core/content/themes/source b/ghost/core/content/themes/source
diff --git a/ghost/core/core/boot.js b/ghost/core/core/boot.js
@@ -318,7 +318,7 @@ async function initServices() {
     const indexnow = require('./server/services/indexnow');
     const slack = require('./server/services/slack');
     const webhooks = require('./server/services/webhooks');
-    const scheduling = require('./server/adapters/scheduling');
+    const postScheduling = require('./server/services/post-scheduling');
     const comments = require('./server/services/comments');
     const staffService = require('./server/services/staff');
     const memberAttribution = require('./server/services/member-attribution');
@@ -340,14 +340,19 @@ async function initServices() {
     const statsService = require('./server/services/stats');
     const explorePingService = require('./server/services/explore-ping');
 
+    const {
+        createAdapter: createSchedulerAdapter,
+        getSchedulerIntegration
+    } = require('./server/adapters/scheduling/utils');
     const urlUtils = require('./shared/url-utils');
 
-    // NOTE: Members service depends on these
-    //       so they are initialized before it.
-    await stripe.init();
-
-    // NOTE: newsletter service and email service depend on email address service
-    await emailAddressService.init(),
+    // Initialize things that other services depend on first.
+    const schedulerAdapter = createSchedulerAdapter();
+    const [schedulerIntegration] = await Promise.all([
+        getSchedulerIntegration(),
+        stripe.init(),
+        emailAddressService.init()
+    ]);
 
     await Promise.all([
         identityTokens.init(),
@@ -366,8 +371,10 @@ async function initServices() {
         emailService.init(),
         emailAnalytics.init(),
         webhooks.listen(),
-        scheduling.init({
-            apiUrl: urlUtils.urlFor('api', {type: 'admin'}, true)
+        postScheduling.init({
+            apiUrl: urlUtils.urlFor('api', {type: 'admin'}, true),
+            adapter: schedulerAdapter,
+            integration: schedulerIntegration
         }),
         comments.init(),
         linkTracking.init(),
+0 −0		assets/built/source.js
+1 −1		gulpfile.js
+3 −2		package.json