Resolved conflict in app/views/boards/show/_columns.html.erb by combining:
- hide-scrollbar class from main
- navigable-list controller from column-nav-keyboard
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude <noreply@anthropic.com>
* main: (41 commits)
Remove animations from popups
Remove fixed position
Sticky Fizzy nav
Account for MS mail
Style avatar initials
Save three requests per card view
Ensure mention avatars cover the entire circle
Bump fizzy
Enable public file server for assets
Respect size
Reuse logo as avatar
Add test
Add background color
Don't render SVG avatars in emails since mail services won't render them
Disable user creation tests for the OSS config
Update test
Remove debug
Further copy tweaks
More copy and design edits
Extract saas helpers into a concern
...
* main:
Order of concerns
Redirect to root to avoid changing the path by default
Make sure that only admins or card creators can delete cards
Make sure only admins or collection creators can toggle the individual access settings
Make sure only admins or collection creators can toggle the all access setting
Update seeds from "Collection" to "Board"
Rename concern
Fix: constant name
Rename script I did not mean to commit
Support old public collection urls
Support old collection urls
Support old events in the timeline
Invalidate HTTP cache
Support current events after renaming
Replace collection with board in the code, tests green
Baseline replacing collection with board across code
Jason Zimdars