nyastodon/app/policies
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.
2018-12-15 10:45:53 +01:00
..
account_moderation_note_policy.rb Add moderator role and add pundit policies for admin actions (#5635) 2017-11-11 20:23:33 +01:00
account_policy.rb Add admin ability to remove an user's header image (#9495) 2018-12-11 19:28:03 +01:00
application_policy.rb Account archive download (#6460) 2018-02-21 23:21:32 +01:00
backup_policy.rb Account archive download (#6460) 2018-02-21 23:21:32 +01:00
custom_emoji_policy.rb Add moderator role and add pundit policies for admin actions (#5635) 2017-11-11 20:23:33 +01:00
domain_block_policy.rb Add moderator role and add pundit policies for admin actions (#5635) 2017-11-11 20:23:33 +01:00
email_domain_block_policy.rb Add moderator role and add pundit policies for admin actions (#5635) 2017-11-11 20:23:33 +01:00
instance_policy.rb Add moderator role and add pundit policies for admin actions (#5635) 2017-11-11 20:23:33 +01:00
invite_policy.rb Add admin function to deactivate all invites (#8279) 2018-08-19 00:58:53 +02:00
relay_policy.rb Add federation relay support (#7998) 2018-07-13 02:16:06 +02:00
report_note_policy.rb Feature: Report improvements (#6967) (#7000) 2018-04-02 22:04:14 +02:00
report_policy.rb Add moderator role and add pundit policies for admin actions (#5635) 2017-11-11 20:23:33 +01:00
settings_policy.rb Add moderator role and add pundit policies for admin actions (#5635) 2017-11-11 20:23:33 +01:00
status_policy.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
subscription_policy.rb Add moderator role and add pundit policies for admin actions (#5635) 2017-11-11 20:23:33 +01:00
tag_policy.rb Add profile directory (#9427) 2018-12-06 17:36:11 +01:00
user_policy.rb Allow mods to disable login, improve message when login disabled (#8329) 2018-08-23 23:26:29 +02:00