chore: sync prod → dev (re-align release merge history) by teetangh · Pull Request #1100 · Practitionist/familiarise_web

teetangh · 2026-08-03T12:22:48Z

Summary

Pulls prod merge commits into dev so histories re-align after recent release/dev-to-prod-* promotions (incl. release: dev → prod — 2026-08-01 (#1091 booking algorithm) #1094).
No file content changes vs current dev tip — history-only sync.

Why

Release PRs routinely merge prod into the release branch before cutting to prod. Those merge commits land on prod but not on dev, so the branches drift in graph shape even when trees match.

Test plan

Confirm GitHub shows empty / trivial file diff
Merge with a normal merge commit (not squash) so history stays intact
After merge, git fetch && git log origin/dev..origin/prod is empty (or only newer post-merge work)

Made with Cursor

Summary by CodeRabbit

Tests
- Stabilized booking algorithm tests by using a fixed system date.
- Ensured time-dependent fixtures consistently remain in the future.
- Added cleanup to restore normal timer behavior after tests complete.

…uling-timezone limits + multi-tab allocation guard) (#999) release: dev → prod — 2026-07-17 (booking calendar correctness: scheduling-timezone limits + multi-tab allocation guard)

…07-17-2 release: dev → prod — 2026-07-17 #2 (refund gateway wiring + booking lifecycle correctness + request-list perf)

…07-17-3 release: dev → prod — 2026-07-17 #3 (booking lifecycle + request-list perf + refund hardening)

…07-18 release: dev → prod — 2026-07-18 (enterprise productionization #1019 + personal-vs-org split #1023 + per-appointment support #1022 + collaborator/earnings org-splits #1026/#1027 + dashboard/booking perf #1017/#1018)

…07-27 release: dev → prod — 2026-07-27 (dashboard navigation IA + authz, privacy and money correctness)

…07-28 release: dev → prod — 2026-07-28 (org participant surfaces + waitlist→newsletter)

…07-28-2 release: dev → prod — 2026-07-28 (#2) waitlist signup hardening

…07-28-3 release: dev → prod — 2026-07-28 #3 (dashboard Resources split + Support section + chat skeleton fix)

…07-29 release: dev → prod — 2026-07-29 (money subsystem productionization)

…026-07-30

…07-30 release: dev → prod (public IA + organisations directory, paid trials)

…026-07-30-2

…07-30-2 release: dev → prod (organisation experts + directory cache fix)

…026-07-30-3

…07-30-3 release: dev → prod — org catalog, plan archiving, notification scoping

GitHub reports the head as BEHIND because prod carries merge-commit nodes that never travel back to dev. Content-wise dev is already a strict superset; this only satisfies the up-to-date branch protection, as on #1052 and #1056.

…07-31 release: dev → prod — 2026-07-31 (reschedule proposals, offering editor, DRAFT lifecycle, Sentry observability)

GitHub reports the head as BEHIND because prod carries merge-commit nodes that never travel back to dev. Content-wise dev is already a strict superset; this only satisfies the up-to-date branch protection, as on prior release PRs.

…08-01 release: dev → prod — 2026-08-01 (stream, offerings editor, scheduling, payments)

GitHub reports the head as BEHIND because prod carries merge-commit nodes that never travel back to dev. Content-wise dev is already a strict superset; this only satisfies the up-to-date branch protection, as on prior release PRs.

…08-01-2 release: dev → prod — 2026-08-01 (#1091 booking algorithm)

Wall-clock Aug 3 09:00Z made the pastConfirmedSlotCount case reject slots as past and fail CI on the release PR. Co-authored-by: Cursor <cursoragent@cursor.com>

netlify · 2026-08-03T12:22:55Z

✅ Deploy Preview for familiarise ready!

Name	Link
🔨 Latest commit	`c38afa0`
🔍 Latest deploy log	https://app.netlify.com/projects/familiarise/deploys/6a708c8e0f6c4600086ed0ff
😎 Deploy Preview	https://deploy-preview-1100--familiarise.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.
Lighthouse	1 paths audited Performance: 77 Accessibility: 99 Best Practices: 92 SEO: 90 PWA: - View the detailed breakdown and full score reports

To edit notification comments on pull requests, go to your Netlify project configuration.

gemini-code-assist · 2026-08-03T12:23:27Z

Caution

The consumer version of Gemini Code Assist on GitHub has been sunset. All code review activity has officially ceased.

…08-03 release: dev → prod — 2026-08-03 (enterprise marketing + loading skeletons + Sentry noise)

coderabbitai · 2026-08-03T12:42:33Z

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: 35eb0c6c-3497-44b7-b81a-f856e1883642

📥 Commits

Reviewing files that changed from the base of the PR and between a71a243 and c38afa0.

📒 Files selected for processing (1)

__tests__/booking-algorithm/mode-parity.test.ts

📝 Walkthrough

Walkthrough

The booking parity tests now use a fixed July 20, 2026 clock. The suite restores real timers after execution. The FUTURE_SUNDAY comment identifies the fixture date relative to the pinned clock.

Changes

Booking test determinism

Layer / File(s)	Summary
Pin test clock and document fixture date `__tests__/booking-algorithm/mode-parity.test.ts`	The suite pins system time to `2026-07-20T12:00:00.000Z`, restores real timers after execution, and updates the `FUTURE_SUNDAY` fixture comment.

Estimated code review effort: 2 (Simple) | ~5 minutes

Poem

I’m a rabbit with a clock in my paw,
July time keeps every date in law.
Future Sundays wait beyond the sun,
Real timers return when tests are done.
Hop, hop—parity runs as one!

🚥 Pre-merge checks | ✅ 5

✅ Passed checks (5 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title clearly describes the primary objective: syncing prod into dev to re-align release merge history.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.

✨ Finishing Touches

📝 Generate docstrings

Create stacked PR
Commit on current branch

🧪 Generate unit tests (beta)

Create PR with unit tests
Commit unit tests in branch prod

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands.}

sonarqubecloud · 2026-08-03T12:43:17Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

dosubot · 2026-08-03T12:53:58Z

📄 Knowledge review

Dosu skipped reviewing this PR because your organization has used its 200 included credits for the month. Your usage will reset on 2026-09-01. To have Dosu review this PR before then, ask your organization admin to upgrade to a pro account.

teetangh and others added 23 commits July 17, 2026 18:32

release: dev → prod — 2026-07-17 (booking calendar correctness: sched…

97233eb

…uling-timezone limits + multi-tab allocation guard) (#999) release: dev → prod — 2026-07-17 (booking calendar correctness: scheduling-timezone limits + multi-tab allocation guard)

Merge pull request #1014 from Practitionist/release/dev-to-prod-2026-…

654c4cd

…07-17-2 release: dev → prod — 2026-07-17 #2 (refund gateway wiring + booking lifecycle correctness + request-list perf)

Merge pull request #1016 from Practitionist/release/dev-to-prod-2026-…

a60e5a6

…07-17-3 release: dev → prod — 2026-07-17 #3 (booking lifecycle + request-list perf + refund hardening)

Merge pull request #1031 from Practitionist/release/dev-to-prod-2026-…

489f0f0

…07-27 release: dev → prod — 2026-07-27 (dashboard navigation IA + authz, privacy and money correctness)

Merge pull request #1036 from Practitionist/release/dev-to-prod-2026-…

c822461

…07-28 release: dev → prod — 2026-07-28 (org participant surfaces + waitlist→newsletter)

Merge pull request #1038 from Practitionist/release/dev-to-prod-2026-…

a1140b8

…07-28-2 release: dev → prod — 2026-07-28 (#2) waitlist signup hardening

Merge pull request #1040 from Practitionist/release/dev-to-prod-2026-…

6c3fd1d

…07-28-3 release: dev → prod — 2026-07-28 #3 (dashboard Resources split + Support section + chat skeleton fix)

Merge pull request #1043 from Practitionist/release/dev-to-prod-2026-…

7104871

…07-29 release: dev → prod — 2026-07-29 (money subsystem productionization)

Merge remote-tracking branch 'origin/prod' into release/dev-to-prod-2…

5ab1f74

…026-07-30

Merge pull request #1047 from Practitionist/release/dev-to-prod-2026-…

e1a4278

…07-30 release: dev → prod (public IA + organisations directory, paid trials)

Merge remote-tracking branch 'origin/prod' into release/dev-to-prod-2…

cdcf45a

…026-07-30-2

Merge pull request #1052 from Practitionist/release/dev-to-prod-2026-…

57e5fd2

…07-30-2 release: dev → prod (organisation experts + directory cache fix)

Merge remote-tracking branch 'origin/prod' into release/dev-to-prod-2…

69faf88

…026-07-30-3

Merge pull request #1056 from Practitionist/release/dev-to-prod-2026-…

4e8f6ff

…07-30-3 release: dev → prod — org catalog, plan archiving, notification scoping

chore(release): merge prod into the release branch

1e5673a

GitHub reports the head as BEHIND because prod carries merge-commit nodes that never travel back to dev. Content-wise dev is already a strict superset; this only satisfies the up-to-date branch protection, as on #1052 and #1056.

Merge pull request #1063 from Practitionist/release/dev-to-prod-2026-…

5991f08

…07-31 release: dev → prod — 2026-07-31 (reschedule proposals, offering editor, DRAFT lifecycle, Sentry observability)

chore(release): merge prod into the release branch

2ed1d91

GitHub reports the head as BEHIND because prod carries merge-commit nodes that never travel back to dev. Content-wise dev is already a strict superset; this only satisfies the up-to-date branch protection, as on prior release PRs.

Merge pull request #1090 from Practitionist/release/dev-to-prod-2026-…

a62da8f

…08-01 release: dev → prod — 2026-08-01 (stream, offerings editor, scheduling, payments)

chore(release): merge prod into the release branch

78969f6

GitHub reports the head as BEHIND because prod carries merge-commit nodes that never travel back to dev. Content-wise dev is already a strict superset; this only satisfies the up-to-date branch protection, as on prior release PRs.

Merge pull request #1094 from Practitionist/release/dev-to-prod-2026-…

ada1116

…08-01-2 release: dev → prod — 2026-08-01 (#1091 booking algorithm)

Merge branch 'prod' into release/dev-to-prod-2026-08-03

6bb849a

fix(test): pin clock in mode-parity so Aug fixtures stay future

8ea0493

Wall-clock Aug 3 09:00Z made the pastConfirmedSlotCount case reject slots as past and fail CI on the release PR. Co-authored-by: Cursor <cursoragent@cursor.com>

Merge pull request #1099 from Practitionist/release/dev-to-prod-2026-…

c38afa0

…08-03 release: dev → prod — 2026-08-03 (enterprise marketing + loading skeletons + Sentry noise)

teetangh merged commit 8b6db5d into dev Aug 3, 2026
8 checks passed

teetangh mentioned this pull request Aug 10, 2026

chore(release): back-merge prod → dev after the 2026-08-10 release #1131

Merged

Navigation Menu

Uh oh!

chore: sync prod → dev (re-align release merge history) - #1100

chore: sync prod → dev (re-align release merge history)#1100
teetangh merged 24 commits into
devfrom
prod

teetangh commented Aug 3, 2026 •

edited by coderabbitai Bot

Loading

Uh oh!

netlify Bot commented Aug 3, 2026 •

edited

Loading

Uh oh!

gemini-code-assist Bot commented Aug 3, 2026

Uh oh!

coderabbitai Bot commented Aug 3, 2026 •

edited

Loading

Walkthrough

Changes

Uh oh!

sonarqubecloud Bot commented Aug 3, 2026

Uh oh!

Uh oh!

dosubot Bot commented Aug 3, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Uh oh!

Conversation

teetangh commented Aug 3, 2026 • edited by coderabbitai Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Why

Test plan

Summary by CodeRabbit

Uh oh!

netlify Bot commented Aug 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Deploy Preview for familiarise ready!

Uh oh!

gemini-code-assist Bot commented Aug 3, 2026

Uh oh!

coderabbitai Bot commented Aug 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Uh oh!

sonarqubecloud Bot commented Aug 3, 2026

Quality Gate passed

Uh oh!

Uh oh!

dosubot Bot commented Aug 3, 2026

📄 Knowledge review

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

teetangh commented Aug 3, 2026 •

edited by coderabbitai Bot

Loading

netlify Bot commented Aug 3, 2026 •

edited

Loading

coderabbitai Bot commented Aug 3, 2026 •

edited

Loading