Skip to content

Forward-merge 6.x into main - #211

Merged
edalzell merged 7 commits into
mainfrom
chore/forward-merge-6.x
Sep 9, 2026
Merged

edalzell merged 7 commits into
mainfrom
chore/forward-merge-6.x

Conversation

@edalzell

@edalzell edalzell commented Sep 9, 2026 •

Copy link
Copy Markdown
Member

Summary

  • Brings current 6.x (including released v6.2.0) onto main: online_url, ICS location/docs fixes, and the PR-gated release workflow on the release line
  • Conflict resolution keeps the 6.x online_url contract (docs, Event::eventUrl(), ICS tests); main-only work (empty/invalid timezone tag params, release workflow on main) stays
  • Still does not add declared coordinates as a required schema change — nested location remains a 7.0 topic (#210 closed, #194/#190)

Test plan

  • CI green
  • online_url + multi-day ICS tests present on main
  • Timezone tag param tests from #199 still present

@github-actions github-actions Bot added the chore label Sep 9, 2026
edalzell and others added 3 commits September 9, 2026 14:49
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Bring v6.2.0 (online_url + ICS fixes) onto main after the release.
@edalzell
edalzell force-pushed the chore/forward-merge-6.x branch from 724490d to 9266fdf Compare September 9, 2026 21:59
@edalzell edalzell changed the title Forward-merge 6.x into main chore: forward-merge 6.x into main Sep 9, 2026
@edalzell edalzell changed the title chore: forward-merge 6.x into main Forward-merge 6.x into main Sep 9, 2026
@edalzell
edalzell merged commit eb72448 into main Sep 9, 2026
26 checks passed
@edalzell
edalzell deleted the chore/forward-merge-6.x branch September 9, 2026 22:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant