Merge branch 'main' into lexical

* main:
  Don't choke when rendering commands where the card was deleted
  Update tests
  Rework system events
  test: add missing assertions
  dep: bump active_record-tenanted to fix URI support
  Remove hyphen from "Un-do"
  Prevent default when handling keyboard shortcuts
  dep: update AR::Tenanted to support database URIs
  Detect platform and label the correct hotkey shortcut
  Things got too tight
  Don't require TLS for Beamer at the moment
  dep: update dependencies

# Conflicts:
#	Gemfile
#	Gemfile.lock
#	app/assets/stylesheets/comments.css
This commit is contained in:
Jorge Manrubia
2025-05-29 12:44:14 +02:00
19 changed files with 140 additions and 111 deletions
+1
View File
@@ -29,6 +29,7 @@ gem "rouge"
gem "jbuilder"
gem "actiontext-lexical", github: "basecamp/actiontext-lexical"
gem "image_processing", "~> 1.14"
gem "platform_agent"
# Telemetry and logging
gem "sentry-ruby"