* origin/main: (67 commits)
  Wrap join code redemption in a lock
  Remove redundant include
  Replace custom code generator with Base32
  Test that you can't go to the magic link screen without an email
  Bundle drift detection and correction (#2101)
  Refactor: Use Rails range syntax in ActivitySpike query (#2080)
  Fix indentation in multi_db.rb initializer (#2082)
  Fix typo in translate property in card columns CSS (#2090)
  Refactor: use idiomatic .last instead of .order(:desc).first (#2098)
  bin/bundle-both (#2100)
  API: Allow updates to `last_active_at` (#2076)
  Move email address into hint line
  Bump fizzy-saas to pickup another staging change.
  Remove the rails credentials from .gitattributes
  Fix typo: minues → minutes
  Fix duplicate word: use use → use
  Add QrCodesController test
  Fix typo in _entropy.html.erb
  Show the email address you are signing in with
  Prohibit access to magic links unless an email address
  ...

# Conflicts:
#	app/controllers/sessions/magic_links_controller.rb
#	app/controllers/sessions_controller.rb