diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-12-18 13:17:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-18 13:17:37 +0100 |
| commit | 3b9a6049adf3ee6844a81622c297dd893836f79d (patch) | |
| tree | faf39c54064077baa984998a589803ecb7ecf230 /app/models/admin | |
| parent | fec4ed507466617ef34304b7d00d0383e8a958bb (diff) | |
| parent | e061ea5f71109edbbf7869265f443448cace4f60 (diff) | |
Merge pull request #1650 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/admin')
| -rw-r--r-- | app/models/admin/action_log_filter.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/admin/action_log_filter.rb b/app/models/admin/action_log_filter.rb index 2af9d7c9c..12136223b 100644 --- a/app/models/admin/action_log_filter.rb +++ b/app/models/admin/action_log_filter.rb @@ -26,6 +26,7 @@ class Admin::ActionLogFilter destroy_domain_allow: { target_type: 'DomainAllow', action: 'destroy' }.freeze, destroy_domain_block: { target_type: 'DomainBlock', action: 'destroy' }.freeze, destroy_email_domain_block: { target_type: 'EmailDomainBlock', action: 'destroy' }.freeze, + destroy_instance: { target_type: 'Instance', action: 'destroy' }.freeze, destroy_unavailable_domain: { target_type: 'UnavailableDomain', action: 'destroy' }.freeze, destroy_status: { target_type: 'Status', action: 'destroy' }.freeze, disable_2fa_user: { target_type: 'User', action: 'disable' }.freeze, @@ -49,6 +50,7 @@ class Admin::ActionLogFilter update_announcement: { target_type: 'Announcement', action: 'update' }.freeze, update_custom_emoji: { target_type: 'CustomEmoji', action: 'update' }.freeze, update_status: { target_type: 'Status', action: 'update' }.freeze, + unblock_email_account: { target_type: 'Account', action: 'unblock_email' }.freeze, }.freeze attr_reader :params |