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 83dc54c487 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file.		5 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	Add (back) rails-level JSON caching (#11333)	5 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 sr locale being selected over sr-Latn (#13693)	5 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	5 years ago
signature_authentication.rb	Allow retrieval of private statuses (single or in outbox) using HTTP signatures (#6225)	7 years ago
signature_verification.rb	Change signature verification to ignore signatures with invalid host (#13033)	5 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	5 years ago
user_tracking_concern.rb	Fix #6331 (#6341)	7 years ago