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 12c8ac9e14 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
..
activitypub	Fix serialization of replies when some of them are URIs (#13957)	5 years ago
admin	Fix reported accounts not being whitelisted when resolving a spamcheck report (#13289)	5 years ago
api	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
auth	Add e-mail-based sign in challenge for users with disabled 2FA (#14013)	5 years ago
concerns	Fix sr locale being selected over sr-Latn (#13693)	5 years ago
oauth	Bump doorkeeper from 5.3.3 to 5.4.0 (#13733)	5 years ago
settings	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
well_known	Fix webfinger returning wrong status code on malformed or missing param (#13759)	5 years ago
about_controller_spec.rb	…
account_follow_controller_spec.rb	Add specific rate limits for posting and following (#13172)	5 years ago
account_unfollow_controller_spec.rb	…
accounts_controller_spec.rb	Add more ActivityPub controller tests (#13590)	5 years ago
application_controller_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
authorize_interactions_controller_spec.rb	…
emojis_controller_spec.rb	…
follower_accounts_controller_spec.rb	Hide blocked users from more places (#12733)	5 years ago
following_accounts_controller_spec.rb	Hide blocked users from more places (#12733)	5 years ago
health_check_controller_spec.rb	Add test for health_check endpoint	5 years ago
home_controller_spec.rb	…
intents_controller_spec.rb	…
invites_controller_spec.rb	…
manifests_controller_spec.rb	…
media_controller_spec.rb	…
relationships_controller_spec.rb	…
remote_follow_controller_spec.rb	Refactor monkey-patching of Goldfinger (#12561)	5 years ago
remote_interaction_controller_spec.rb	…
shares_controller_spec.rb	…
statuses_controller_spec.rb	Add more tests for ActivityPub controllers (#13585)	5 years ago
tags_controller_spec.rb	…