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.

Claire d8fdbb054e Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/validators/status_length_validator.rb`: Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real conflict. Applied upstream changes. - `package.json`: glitch-soc-only dependency textually too close to a dependency updated upstream, not a real conflict. Applied upstream changes.		4 years ago
..
activitypub	Add support for reversible suspensions through ActivityPub (#14989)	4 years ago
admin	Fix performance on instances list in admin UI (#15282)	4 years ago
api	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
auth	Add `details` to error response for `POST /api/v1/accounts` in REST API (#15803)	4 years ago
concerns	Change account suspensions to be reversible by default (#14726)	4 years ago
oauth	Bump doorkeeper from 5.3.3 to 5.4.0 (#13733)	5 years ago
settings	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
well_known	Add support for reversible suspensions through ActivityPub (#14989)	4 years ago
about_controller_spec.rb	…
account_follow_controller_spec.rb	Add support for reversible suspensions through ActivityPub (#14989)	4 years ago
account_unfollow_controller_spec.rb	Add support for reversible suspensions through ActivityPub (#14989)	4 years ago
accounts_controller_spec.rb	Add support for reversible suspensions through ActivityPub (#14989)	4 years ago
application_controller_spec.rb	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
authorize_interactions_controller_spec.rb	Change ResolveAccountService's handling of skip_webfinger (#15750)	4 years ago
emojis_controller_spec.rb	…
follower_accounts_controller_spec.rb	Add support for reversible suspensions through ActivityPub (#14989)	4 years ago
following_accounts_controller_spec.rb	Add support for reversible suspensions through ActivityPub (#14989)	4 years ago
health_check_controller_spec.rb	…
home_controller_spec.rb	…
intents_controller_spec.rb	…
invites_controller_spec.rb	…
manifests_controller_spec.rb	…
media_controller_spec.rb	Fix media attachments enumeration (#14254)	4 years ago
media_proxy_controller_spec.rb	Fix media attachments enumeration (#14254)	4 years ago
relationships_controller_spec.rb	…
remote_follow_controller_spec.rb	Add support for reversible suspensions through ActivityPub (#14989)	4 years ago
remote_interaction_controller_spec.rb	…
shares_controller_spec.rb	…
statuses_controller_spec.rb	Add support for reversible suspensions through ActivityPub (#14989)	4 years ago
tags_controller_spec.rb	…