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/domain_blocks_controller.rb | |
| parent | faad820458401b5a01f24d4da4bf2acf59ef440d (diff) | |
| parent | e84fecb7e97851ed56f4d954e2d68128bb87da37 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/controllers/admin/domain_blocks_controller.rb')
| -rw-r--r-- | app/controllers/admin/domain_blocks_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/admin/domain_blocks_controller.rb b/app/controllers/admin/domain_blocks_controller.rb index e383dc831..64de2cbf0 100644 --- a/app/controllers/admin/domain_blocks_controller.rb +++ b/app/controllers/admin/domain_blocks_controller.rb @@ -21,6 +21,7 @@ module Admin if @domain_block.save DomainBlockWorker.perform_async(@domain_block.id) + log_action :create, @domain_block redirect_to admin_domain_blocks_path, notice: I18n.t('admin.domain_blocks.created_msg') else render :new @@ -34,6 +35,7 @@ module Admin def destroy authorize @domain_block, :destroy? UnblockDomainService.new.call(@domain_block, retroactive_unblock?) + log_action :destroy, @domain_block redirect_to admin_domain_blocks_path, notice: I18n.t('admin.domain_blocks.destroyed_msg') end |