Skip to content

[pull] main from TryGhost:main#1126

Merged
pull[bot] merged 8 commits intocode:mainfrom
TryGhost:main
May 7, 2026
Merged

[pull] main from TryGhost:main#1126
pull[bot] merged 8 commits intocode:mainfrom
TryGhost:main

Conversation

@pull
Copy link
Copy Markdown

@pull pull Bot commented May 7, 2026

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

EvanHahn and others added 8 commits May 7, 2026 11:33
no ref

`url.parse` and `url.resolve` are deprecated. Let's replace a few of
them with `URL`. (These are the easy ones.)
no ref

1. Renamed an export with a clearer name
2. Used named exports instead of exporting an array
ref 986f78e

Let's test this middleware without stubbing.
…27726)

ref https://linear.app/ghost/issue/NY-1260

This is a simple rename, now that this service is in charge of more than
just welcome email automations.
…27771)

closes https://linear.app/ghost/issue/BER-3617

We're updating the copy used for member activity events during the gift
subscription lifecycle:

Member redeems gift (`gift_redemption_event`):
🎁 Started paid subscription via gift →  🎁 Started gift subscription

Gift subscription expires (`gift_ended_event`):
$ Ended paid subscription → 🎁 (strike-through) Gift subscription expired

Gift member continues to paid sub (`subscription_event`):
$ Continued paid subscription after gift → $ Started paid subscription
closes https://linear.app/ghost/issue/BER-3618

When a gift member upgrades to a paid subscription, Ghost converts their
remaining gift days into a Stripe trial period. 

Until now, that trial period was invisible in the **💸 Paid subscription
started** staff email — staff saw "Premium • $6.00/month" with no
indication that the new member wouldn't be charged for N days.

This PR surfaces the trial days inline on the Tier line, mirroring the
visual treatment we already use for trial offers:

> Premium • $6.00/month • **3 days free**

…with `3 days free` rendered in the site's accent color.

The change also applies to signups to a paid tier with a trial period.
towards https://linear.app/ghost/issue/NY-1265

_This is a test-only change._

We decided that these tests are mostly redundant with the E2E tests.
Let's remove them.
ref INC-280

Fixes comped member creation so Ghost only reuses zero-value Stripe
prices that are actually marked as `Complimentary`.

Previously, `setComplimentarySubscription()` selected the first
zero-value price on the default paid tier. If a site had another $0
price, Ghost could create the comped subscription with that price and
then misclassify the member because later logic only treats
`Complimentary` as comped.
@pull pull Bot locked and limited conversation to collaborators May 7, 2026
@pull pull Bot added the ⤵️ pull label May 7, 2026
@pull pull Bot merged commit c5066aa into code:main May 7, 2026
1 check passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants