diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-12-16 19:45:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-16 19:45:17 +0100 |
| commit | 7efef7db9ed6f7b25a28166c1b75a28adbaf7cdb (patch) | |
| tree | ad8ebb28e0466649785afa167e8711debb271e68 /app/models/admin | |
| parent | d911c17f521d6b13861caa886715a50b644007a1 (diff) | |
| parent | 50d62fe2e749a5ab2b2bed81d5a9449b5e733964 (diff) | |
Merge pull request #1648 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/admin')
| -rw-r--r-- | app/models/admin/action_log.rb | 2 | ||||
| -rw-r--r-- | app/models/admin/action_log_filter.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/models/admin/action_log.rb b/app/models/admin/action_log.rb index 1d1db1b7a..852bff713 100644 --- a/app/models/admin/action_log.rb +++ b/app/models/admin/action_log.rb @@ -17,7 +17,7 @@ class Admin::ActionLog < ApplicationRecord serialize :recorded_changes belongs_to :account - belongs_to :target, polymorphic: true + belongs_to :target, polymorphic: true, optional: true default_scope -> { order('id desc') } diff --git a/app/models/admin/action_log_filter.rb b/app/models/admin/action_log_filter.rb index 6e19dcf70..2af9d7c9c 100644 --- a/app/models/admin/action_log_filter.rb +++ b/app/models/admin/action_log_filter.rb @@ -11,6 +11,8 @@ class Admin::ActionLogFilter assigned_to_self_report: { target_type: 'Report', action: 'assigned_to_self' }.freeze, change_email_user: { target_type: 'User', action: 'change_email' }.freeze, confirm_user: { target_type: 'User', action: 'confirm' }.freeze, + approve_user: { target_type: 'User', action: 'approve' }.freeze, + reject_user: { target_type: 'User', action: 'reject' }.freeze, create_account_warning: { target_type: 'AccountWarning', action: 'create' }.freeze, create_announcement: { target_type: 'Announcement', action: 'create' }.freeze, create_custom_emoji: { target_type: 'CustomEmoji', action: 'create' }.freeze, |