Thibaut Girka aae60a2366 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/concerns/two_factor_authentication_concern.rb`: Conflict due to glitch-soc's theming system. Ported upstream changes.		2020-06-24 15:33:41 +02:00
..
account_controller_concern.rb	Add ActivityPub secure mode (#11269)	2019-07-11 20:11:09 +02:00
account_owned_concern.rb	Add whitelist mode (#11291)	2019-07-30 11:10:46 +02:00
accountable_concern.rb
authorization.rb
cache_concern.rb	Add (back) rails-level JSON caching (#11333)	2019-07-21 22:32:16 +02:00
challengable_concern.rb	Add password challenge to 2FA settings, e-mail notifications (#11878)	2019-09-18 16:37:27 +02:00
export_controller_concern.rb	Add account migration UI (#11846)	2019-09-19 20:58:19 +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	Add specific rate limits for posting and following (#13172)	2020-03-08 15:17:39 +01:00
session_tracking_concern.rb
sign_in_token_authentication_concern.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-24 15:33:41 +02:00
signature_authentication.rb
signature_verification.rb	Change signature verification to ignore signatures with invalid host (#13033)	2020-02-03 17:48:23 +01:00
status_controller_concern.rb	Refactor controllers for statuses, accounts, and more (#11249)	2019-07-08 12:03:45 +02:00
two_factor_authentication_concern.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-24 15:33:41 +02:00
user_tracking_concern.rb