mastodon/app/controllers/concerns
Claire 7782e4dc0d Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/about_controller.rb`:
  Minor conflict caused by glitch-soc's theming system.
  Ported upstream changes.
2020-12-10 09:41:49 +01:00
..
account_controller_concern.rb
account_owned_concern.rb Add support for reversible suspensions through ActivityPub (#14989) 2020-11-08 00:28:39 +01:00
accountable_concern.rb
authorization.rb
cache_concern.rb Make Array-creation behavior of Paginable more predictable (#14687) 2020-08-31 12:47:09 +02:00
challengable_concern.rb Bump rubocop from 0.86.0 to 0.88.0 (#14412) 2020-09-01 03:04:00 +02:00
export_controller_concern.rb Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02:00
localized.rb Fix not working I18n on 2FA and Sign in token page (#14087) 2020-06-20 13:30:13 +02:00
rate_limit_headers.rb
registration_spam_concern.rb Add honeypot fields and minimum fill-out time for sign-up form (#15276) 2020-12-10 06:27:26 +01:00
session_tracking_concern.rb
sign_in_token_authentication_concern.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-11-14 00:30:36 +01:00
signature_authentication.rb
signature_verification.rb Tweak signature verification (#15069) 2020-11-01 23:38:31 +01:00
status_controller_concern.rb
two_factor_authentication_concern.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-11-14 00:30:36 +01:00
user_tracking_concern.rb Fix 2FA/sign-in token sessions being valid after password change (#14802) 2020-11-12 23:05:01 +01:00