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 65e994b29b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/directories_controller.rb - app/controllers/settings/applications_controller.rb - app/controllers/settings/base_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/imports_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/sessions_controller.rb - app/controllers/settings/two_factor_authentication/confirmations_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/controllers/settings/two_factor_authentications_controller.rb Conflicts were due to some refactoring already made in glitch-soc when introducing flavours.		6 years ago
..
account_moderation_note_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	7 years ago
account_policy.rb	Add admin ability to remove an user's header image (#9495)	6 years ago
application_policy.rb	Account archive download (#6460)	7 years ago
backup_policy.rb	Account archive download (#6460)	7 years ago
custom_emoji_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	7 years ago
domain_block_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	7 years ago
email_domain_block_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	7 years ago
instance_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	7 years ago
invite_policy.rb	Add admin function to deactivate all invites (#8279)	6 years ago
relay_policy.rb	Add federation relay support (#7998)	6 years ago
report_note_policy.rb	Feature: Report improvements (#6967) (#7000)	7 years ago
report_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	7 years ago
settings_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	7 years ago
status_policy.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
subscription_policy.rb	Add moderator role and add pundit policies for admin actions (#5635)	7 years ago
tag_policy.rb	Add profile directory (#9427)	6 years ago
user_policy.rb	Allow mods to disable login, improve message when login disabled (#8329)	6 years ago