Claire 9ae60f8738 Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream ...

Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
  Upstream ran a lint fix on this file, but this file is different in
  glitch-soc because the feature was added much earlier.
  Ran the lint fix on our own version of the file.

2023-07-12 16:03:05 +02:00

..

access_token_tracking_concern.rb

…

account_controller_concern.rb

…

account_owned_concern.rb

…

accountable_concern.rb

…

admin_export_controller_concern.rb

…

api_caching_concern.rb

…

authorization.rb

…

cache_concern.rb

…

captcha_concern.rb

…

challengable_concern.rb

…

export_controller_concern.rb

…

localized.rb

…

rate_limit_headers.rb

…

registration_spam_concern.rb

…

session_tracking_concern.rb

…

signature_authentication.rb

…

signature_verification.rb

…

theming_concern.rb

…

two_factor_authentication_concern.rb

Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream

2023-07-12 16:03:05 +02:00

user_tracking_concern.rb

…

web_app_controller_concern.rb

…