diff options
author | ThibG <thib@sitedethib.com> | 2020-11-07 21:47:31 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-07 21:47:31 +0100 |
commit | cfb16b9b70a50ec5451c9aebb2c35d3a44701311 (patch) | |
tree | 6ba298899b376d0c8862d77c1e34339a08dc3121 /app/models/admin/action_log_filter.rb | |
parent | 5a9fc749c3eab8d3c93dd282fa89c20a5cb0e994 (diff) | |
parent | e4d62042bdb3b0d675c2367b4c48a2a48647af5e (diff) |
Merge pull request #1453 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/admin/action_log_filter.rb')
-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 0ba7e1609..3a1b67e06 100644 --- a/app/models/admin/action_log_filter.rb +++ b/app/models/admin/action_log_filter.rb @@ -35,9 +35,11 @@ class Admin::ActionLogFilter reopen_report: { target_type: 'Report', action: 'reopen' }.freeze, reset_password_user: { target_type: 'User', action: 'reset_password' }.freeze, resolve_report: { target_type: 'Report', action: 'resolve' }.freeze, + sensitive_account: { target_type: 'Account', action: 'sensitive' }.freeze, silence_account: { target_type: 'Account', action: 'silence' }.freeze, suspend_account: { target_type: 'Account', action: 'suspend' }.freeze, unassigned_report: { target_type: 'Report', action: 'unassigned' }.freeze, + unsensitive_account: { target_type: 'Account', action: 'unsensitive' }.freeze, unsilence_account: { target_type: 'Account', action: 'unsilence' }.freeze, unsuspend_account: { target_type: 'Account', action: 'unsuspend' }.freeze, update_announcement: { target_type: 'Announcement', action: 'update' }.freeze, |