Thibaut Girka 579ccb0bb9 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb - app/controllers/auth/confirmations_controller.rb - app/controllers/auth/sessions_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb		2019-07-23 10:51:07 +02:00
..
account_moderation_note_policy_spec.rb	Add specs for AccountModerationNotePolicy (#9571)	2018-12-19 07:24:03 +01:00
account_policy_spec.rb	Add specs for AccountPolicy (#9575)	2018-12-19 08:56:59 +01:00
backup_policy_spec.rb	Add specs for BackupPolicy (#9576)	2018-12-19 18:24:15 +01:00
custom_emoji_policy_spec.rb	Add specs for CustomEmojiPolicy (#9584)	2018-12-20 03:24:28 +01:00
domain_block_policy_spec.rb	Add specs for DomainBlockPolicy (#9585)	2018-12-20 03:47:51 +01:00
email_domain_block_policy_spec.rb	Add specs for EmailDomainBlockPolicy (#9586)	2018-12-20 03:51:41 +01:00
instance_policy_spec.rb	Redesign admin instances area (#9645)	2019-01-08 13:39:49 +01:00
invite_policy_spec.rb	Add specs for InvitePolicy (#9589)	2018-12-20 04:23:09 +01:00
relay_policy_spec.rb	Add specs for policies (#9591)	2018-12-20 17:52:07 +01:00
report_note_policy_spec.rb	Add specs for ReportNotePolicy (#9592)	2018-12-20 17:52:18 +01:00
report_policy_spec.rb	Add specs for policies (#9591)	2018-12-20 17:52:07 +01:00
settings_policy_spec.rb	Add specs for policies (#9591)	2018-12-20 17:52:07 +01:00
status_policy_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-19 12:58:49 +01:00
tag_policy_spec.rb	Add specs for policies (#9591)	2018-12-20 17:52:07 +01:00
user_policy_spec.rb	Add specs for UserPolicy (#9593)	2018-12-20 17:51:55 +01:00