You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 8c3c27bf06 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/accounts_controller.rb`: Upstream change too close to a glitch-soc change related to instance-local toots. Merged upstream changes. - `app/services/fan_out_on_write_service.rb`: Minor conflict due to glitch-soc's handling of Direct Messages, merged upstream changes. - `yarn.lock`: Not really a conflict, caused by glitch-soc-only dependencies being textually too close to updated upstream dependencies. Merged upstream changes.		4 years ago
..
account_controller_concern.rb	Add ActivityPub secure mode (#11269)	5 years ago
account_owned_concern.rb	Add whitelist mode (#11291)	5 years ago
accountable_concern.rb	Add logging of admin actions (#5757)	7 years ago
authorization.rb	Add moderator role and add pundit policies for admin actions (#5635)	7 years ago
cache_concern.rb	Introduce ApplicationController#cache_collection_paginated_by_id (#14677)	4 years ago
challengable_concern.rb	Add password challenge to 2FA settings, e-mail notifications (#11878)	5 years ago
export_controller_concern.rb	Add account migration UI (#11846)	5 years ago
localized.rb	Fix not working I18n on 2FA and Sign in token page (#14087)	4 years ago
rate_limit_headers.rb	Add specific rate limits for posting and following (#13172)	5 years ago
session_tracking_concern.rb	Update session activation time (fixes #5605) (#7408)	7 years ago
sign_in_token_authentication_concern.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
signature_authentication.rb	Allow retrieval of private statuses (single or in outbox) using HTTP signatures (#6225)	7 years ago
signature_verification.rb	Add support for latest HTTP Signatures spec draft (#14556)	4 years ago
status_controller_concern.rb	Refactor controllers for statuses, accounts, and more (#11249)	5 years ago
two_factor_authentication_concern.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
user_tracking_concern.rb	Fix #6331 (#6341)	7 years ago