Thibaut Girka 0437d70628 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/follower_accounts_controller.rb`: Conflict due to upstream changing suspension logic while glitch-soc has an extra option to hide followers count. Ported upstream changes.		2020-11-08 14:20:35 +01:00
..
account_controller_concern.rb	Add ActivityPub secure mode (#11269)	2019-07-11 20:11:09 +02:00
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	Add specific rate limits for posting and following (#13172)	2020-03-08 15:17:39 +01:00
session_tracking_concern.rb	Update session activation time (fixes #5605) (#7408)	2018-05-11 13:20:58 +02:00
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	Tweak signature verification (#15069)	2020-11-01 23:38:31 +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-08-30 16:13:08 +02:00
user_tracking_concern.rb	…