[pull] main from TryGhost:main#1254
Merged
Merged
Conversation
towards https://linear.app/ghost/issue/NY-1360 ## Before ``` mysql> SELECT name, slug FROM automations; +----------------------+---------------------------+ | name | slug | +----------------------+---------------------------+ | Welcome Email (Free) | member-welcome-email-free | | Welcome Email (Paid) | member-welcome-email-paid | +----------------------+---------------------------+ ``` ## After ``` mysql> SELECT name, slug FROM automations; +--------------------------+---------------------------+ | name | slug | +--------------------------+---------------------------+ | Free member welcome flow | member-welcome-email-free | | Paid member welcome flow | member-welcome-email-paid | +--------------------------+---------------------------+ ``` Note that this doesn't change anything visible about welcome emails, because we don't show those names anywhere.
closes https://linear.app/ghost/issue/NY-1314 Members can now opt out of "updates & announcements" (automation and welcome emails) independently of newsletters and comment notifications. What's changing: - Adds an `enable_updates_and_announcements` member preference, exposed through the members API, output serializers, and the member-newsletters middleware. - Portal: new toggle in email preferences (account + unsubscribe pages) plus a dedicated unsubscribe flow for the `?updates=1` link, and a disabled state on the shared Switch component. - Unsubscribe controller and settings-helpers handle the `updates` param and clear the preference, mirroring how newsletter/comment unsubscribes work. - Automation poll skips sends for members who have opted out. When the preference is unset (null) it falls back to "is the member subscribed to any newsletter?", so existing behaviour is preserved. - Automation emails now carry a one-click List-Unsubscribe header and a footer "Unsubscribe" link pointing at the updates & announcements preference, gated behind the `automations` labs flag. - Bumped Portal to 2.69.6 and added the new i18n strings + context. Co-authored-by: Evan Hahn <evan@ghost.org>
no ref Fixes the `sinon.useFakeTimers` hang that kept 11 integration + e2e-api tests in mocha.
This PR contains the following updates: | Package | Update | Change | |---|---|---| | stripe/stripe-cli | digest | `2daa6a2` → `e87a4da` | --- ### Configuration 📅 **Schedule**: (in timezone Etc/UTC) - Branch creation - Only on Sunday and Saturday (`* * * * 0,6`) - Between 11:00 PM and 11:59 PM, Monday through Friday (`* 23 * * 1-5`) - Between 12:00 AM and 04:59 AM, Monday through Saturday (`* 0-4 * * 1-6`) - Automerge - Only on Sunday and Saturday (`* * * * 0,6`) - Between 11:00 PM and 11:59 PM, Monday through Friday (`* 23 * * 1-5`) - Between 12:00 AM and 04:59 AM, Monday through Saturday (`* 0-4 * * 1-6`) 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://redirect.github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0My4yMzEuMyIsInVwZGF0ZWRJblZlciI6IjQzLjIzMS4zIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119--> Co-authored-by: tryghost-renovate[bot] <269725441+tryghost-renovate[bot]@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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 : )