diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-06 18:49:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-06 18:49:46 +0100 |
| commit | 54101563bbadbfafd9291a867d7fbea6df3a8b7b (patch) | |
| tree | fcf9a125f6ebc3ad4182fa0edcbd7101b33aebb0 /app/models/admin | |
| parent | 2f8fb49d1314db931385089bc9004a48700161ad (diff) | |
| parent | 21d6bc16893a9dd24c5ef54cf2f554846c8eca5b (diff) | |
Merge pull request #1892 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 | 1 | ||||
| -rw-r--r-- | app/models/admin/status_batch_action.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/models/admin/action_log_filter.rb b/app/models/admin/action_log_filter.rb index c7a7e1a4c..edb391e2e 100644 --- a/app/models/admin/action_log_filter.rb +++ b/app/models/admin/action_log_filter.rb @@ -47,6 +47,7 @@ class Admin::ActionLogFilter promote_user: { target_type: 'User', action: 'promote' }.freeze, remove_avatar_user: { target_type: 'User', action: 'remove_avatar' }.freeze, reopen_report: { target_type: 'Report', action: 'reopen' }.freeze, + resend_user: { target_type: 'User', action: 'resend' }.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, diff --git a/app/models/admin/status_batch_action.rb b/app/models/admin/status_batch_action.rb index 0ec4fef82..0f019b854 100644 --- a/app/models/admin/status_batch_action.rb +++ b/app/models/admin/status_batch_action.rb @@ -44,7 +44,7 @@ class Admin::StatusBatchAction ApplicationRecord.transaction do statuses.each do |status| - status.discard + status.discard_with_reblogs log_action(:destroy, status) end |