diff options
| author | ThibG <thib@sitedethib.com> | 2018-12-23 15:23:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-23 15:23:12 +0100 |
| commit | 8a3e4a48838405a7a78f2b46cc2b2a7c8fa412fa (patch) | |
| tree | b5d7908956cab9d18dceda381e18cdb4a6e0e4ba /app/controllers/admin/account_moderation_notes_controller.rb | |
| parent | 1a3088364fe602bb48647d78dda440b174424e17 (diff) | |
| parent | cb98e7dbd35c730a58f65112c3fa32ee180a2518 (diff) | |
Merge pull request #871 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/admin/account_moderation_notes_controller.rb')
| -rw-r--r-- | app/controllers/admin/account_moderation_notes_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/admin/account_moderation_notes_controller.rb b/app/controllers/admin/account_moderation_notes_controller.rb index 7d5b9bf52..44f6e34f8 100644 --- a/app/controllers/admin/account_moderation_notes_controller.rb +++ b/app/controllers/admin/account_moderation_notes_controller.rb @@ -14,6 +14,7 @@ module Admin else @account = @account_moderation_note.target_account @moderation_notes = @account.targeted_moderation_notes.latest + @warnings = @account.targeted_account_warnings.latest.custom render template: 'admin/accounts/show' end |