]> cat aescling's git repositories - mastodon.git/commit
Add moderator role and add pundit policies for admin actions (#5635)
authorEugen Rochko <eugen@zeonfederated.com>
Sat, 11 Nov 2017 19:23:33 +0000 (20:23 +0100)
committerGitHub <noreply@github.com>
Sat, 11 Nov 2017 19:23:33 +0000 (20:23 +0100)
commit7bb8b0b2fc0e2e42a4234fed18198cbb7439fe9f
treef629ef40a5e7253c3d7bf353959951c93e5aad6f
parent2b1190065c54f071ae384f6e05b4a087987febba
Add moderator role and add pundit policies for admin actions (#5635)

* Add moderator role and add pundit policies for admin actions

* Add rake task for turning user into mod and revoking it again

* Fix handling of unauthorized exception

* Deliver new report e-mails to staff, not just admins

* Add promote/demote to admin UI, hide some actions conditionally

* Fix unused i18n
44 files changed:
app/controllers/admin/account_moderation_notes_controller.rb
app/controllers/admin/accounts_controller.rb
app/controllers/admin/base_controller.rb
app/controllers/admin/confirmations_controller.rb
app/controllers/admin/custom_emojis_controller.rb
app/controllers/admin/domain_blocks_controller.rb
app/controllers/admin/email_domain_blocks_controller.rb
app/controllers/admin/instances_controller.rb
app/controllers/admin/reported_statuses_controller.rb
app/controllers/admin/reports_controller.rb
app/controllers/admin/resets_controller.rb
app/controllers/admin/roles_controller.rb [new file with mode: 0644]
app/controllers/admin/settings_controller.rb
app/controllers/admin/silences_controller.rb
app/controllers/admin/statuses_controller.rb
app/controllers/admin/subscriptions_controller.rb
app/controllers/admin/suspensions_controller.rb
app/controllers/admin/two_factor_authentications_controller.rb
app/controllers/api/v1/reports_controller.rb
app/controllers/application_controller.rb
app/controllers/concerns/authorization.rb
app/helpers/application_helper.rb
app/models/user.rb
app/policies/account_moderation_note_policy.rb [new file with mode: 0644]
app/policies/account_policy.rb [new file with mode: 0644]
app/policies/application_policy.rb [new file with mode: 0644]
app/policies/custom_emoji_policy.rb [new file with mode: 0644]
app/policies/domain_block_policy.rb [new file with mode: 0644]
app/policies/email_domain_block_policy.rb [new file with mode: 0644]
app/policies/instance_policy.rb [new file with mode: 0644]
app/policies/report_policy.rb [new file with mode: 0644]
app/policies/settings_policy.rb [new file with mode: 0644]
app/policies/status_policy.rb
app/policies/subscription_policy.rb [new file with mode: 0644]
app/policies/user_policy.rb [new file with mode: 0644]
app/views/admin/account_moderation_notes/_account_moderation_note.html.haml
app/views/admin/accounts/show.html.haml
config/i18n-tasks.yml
config/locales/en.yml
config/navigation.rb
config/routes.rb
db/migrate/20171109012327_add_moderator_to_accounts.rb [new file with mode: 0644]
db/schema.rb
lib/tasks/mastodon.rake