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 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system		5 years ago
..
activitypub	…
admin	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	5 years ago
api	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
auth	Add password challenge to 2FA settings, e-mail notifications (#11878)	5 years ago
concerns	Fix base64-encoded file uploads not being possible (#12748)	5 years ago
oauth	…
settings	Merge branch 'master' into glitch-soc/master	5 years ago
well_known	Add a nodeinfo endpoint (#12002)	5 years ago
about_controller_spec.rb	…
account_follow_controller_spec.rb	…
account_unfollow_controller_spec.rb	…
accounts_controller_spec.rb	…
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
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	…
remote_interaction_controller_spec.rb	…
shares_controller_spec.rb	…
statuses_controller_spec.rb	…
tags_controller_spec.rb	…