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 48b8a1f414 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - app/services/remove_status_service.rb - db/schema.rb All conflicts were due to the addition of a `deleted_at` attribute to Statuses and reworked database indexes.		5 years ago
..
account_actions	Add option to include reported statuses in warning e-mail (#11639)	5 years ago
account_moderation_notes	…
account_warnings	…
accounts	Add domain block notes (#11515)	5 years ago
action_logs	…
change_emails	…
custom_emojis	…
dashboard	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
domain_allows	Add whitelist mode (#11291)	5 years ago
domain_blocks	Fix domain block edition in glitch-soc	5 years ago
email_domain_blocks	Add option to block reports from domain (#8830)	6 years ago
followers	…
instances	Add domain block notes (#11515)	5 years ago
invites	…
pending_accounts	…
relays	…
report_notes	…
reports	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
settings	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
statuses	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
tags	Fix weekly usage not being displayed correctly in hashtag admin UI (#11524)	5 years ago
warning_presets	…