diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-11-24 01:17:20 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-11-24 01:17:20 +0000 |
| commit | 167fe2ab08288ce286f5c7660ff0ed587b65b988 (patch) | |
| tree | 1a4c7d23cb3dd6993c0ce57a637a161e3405dba5 /app/controllers/admin/silences_controller.rb | |
| parent | faad820458401b5a01f24d4da4bf2acf59ef440d (diff) | |
| parent | e84fecb7e97851ed56f4d954e2d68128bb87da37 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/controllers/admin/silences_controller.rb')
| -rw-r--r-- | app/controllers/admin/silences_controller.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/controllers/admin/silences_controller.rb b/app/controllers/admin/silences_controller.rb index 01fb292de..4c06a9c0c 100644 --- a/app/controllers/admin/silences_controller.rb +++ b/app/controllers/admin/silences_controller.rb @@ -6,13 +6,15 @@ module Admin def create authorize @account, :silence? - @account.update(silenced: true) + @account.update!(silenced: true) + log_action :silence, @account redirect_to admin_accounts_path end def destroy authorize @account, :unsilence? - @account.update(silenced: false) + @account.update!(silenced: false) + log_action :unsilence, @account redirect_to admin_accounts_path end |