Email for professionals and teams
Merge origin/main into domain sending setup
Hieu Nguyen (Jack)dca90d67ed85
diff --cc drizzle/migrations/0027_add_domain_sending_intent.sqlindex a7baa65,0000000..a7baa65mode 100644,000000..100644--- a/drizzle/migrations/0027_add_domain_sending_intent.sql+++ b/drizzle/migrations/0027_add_domain_sending_intent.sqldiff --cc drizzle/migrations/meta/_journal.jsonindex 402a416,69d41ff..25ca24e--- a/drizzle/migrations/meta/_journal.json+++ b/drizzle/migrations/meta/_journal.json@@@ -180,9 -180,16 +180,23 @@@{"idx": 25,"version": "6",+ "when": 1788691200000,+ "tag": "0025_add_threading_and_cc_bcc",+ "breakpoints": true+ },+ {+ "idx": 26,+ "version": "6",+ "when": 1788691200001,+ "tag": "0026_add_contact_avatars",+ "breakpoints": true++ },++ {++ "idx": 27,++ "version": "6",+ "when": 1788796800000,- "tag": "0025_add_domain_sending_intent",++ "tag": "0027_add_domain_sending_intent",+ "breakpoints": true}]}diff --cc src/lib/setup/migration.tsindex fa4f5dc,f2e00b4..7175b31--- a/src/lib/setup/migration.ts+++ b/src/lib/setup/migration.ts@@@ -24,7 -24,8 +24,9 @@@ const MIGRATION_NAMES ="0022_add_mailbox_auto_reply.sql","0023_add_mailbox_aliases.sql","0024_add_advanced_routing_and_webhook_retries.sql",- "0025_add_domain_sending_intent.sql",+ "0025_add_threading_and_cc_bcc.sql",+ "0026_add_contact_avatars.sql",++ "0027_add_domain_sending_intent.sql",];const INITIAL_SCHEMA_SQL = `diff --cc tests/setup-bootstrap-schema.test.mjsindex 5a89db6,109d10c..cc6aad3--- a/tests/setup-bootstrap-schema.test.mjs+++ b/tests/setup-bootstrap-schema.test.mjs@@@ -26,7 -26,6 +26,7 @@@ test("bootstrap records migrations repr"0013_add_license_settings.sql","0021_add_mailbox_signature.sql","0022_add_mailbox_auto_reply.sql",- "0025_add_domain_sending_intent.sql",++ "0027_add_domain_sending_intent.sql",]) {assert.ok(names.includes(name), `MIGRATION_NAMES is missing ${name}`);}