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 48e6b2360d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/routes.rb Upstream changed some admin routes, conflict was because of an added :show action for statuses on our side. Kept it.		6 years ago
..
account_moderation_note_policy_spec.rb	Add specs for AccountModerationNotePolicy (#9571)	6 years ago
account_policy_spec.rb	Add specs for AccountPolicy (#9575)	6 years ago
backup_policy_spec.rb	Add specs for BackupPolicy (#9576)	6 years ago
custom_emoji_policy_spec.rb	Add specs for CustomEmojiPolicy (#9584)	6 years ago
domain_block_policy_spec.rb	Add specs for DomainBlockPolicy (#9585)	6 years ago
email_domain_block_policy_spec.rb	Add specs for EmailDomainBlockPolicy (#9586)	6 years ago
instance_policy_spec.rb	Add specs for InstancePolicy (#9587)	6 years ago
invite_policy_spec.rb	Add specs for InvitePolicy (#9589)	6 years ago
relay_policy_spec.rb	Add specs for policies (#9591)	6 years ago
report_note_policy_spec.rb	Add specs for ReportNotePolicy (#9592)	6 years ago
report_policy_spec.rb	Add specs for policies (#9591)	6 years ago
settings_policy_spec.rb	Add specs for policies (#9591)	6 years ago
status_policy_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
subscription_policy_spec.rb	Add specs for policies (#9591)	6 years ago
tag_policy_spec.rb	Add specs for policies (#9591)	6 years ago
user_policy_spec.rb	Add specs for UserPolicy (#9593)	6 years ago