diff options
| author | Reverite <github@reverite.sh> | 2019-07-20 18:46:40 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-07-20 18:46:40 -0700 |
| commit | 266540080ef5659060faa7da502123f45bbc04f2 (patch) | |
| tree | 1c34751dd4e199737b7a2a4c511b756760941c52 /app/controllers/admin/domain_blocks_controller.rb | |
| parent | 40fd56351f0a466e0e3785cca4ee27f2a9060e8a (diff) | |
| parent | f1597e1ab90b1fb291f16977877c6ca79bf89676 (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/controllers/admin/domain_blocks_controller.rb')
| -rw-r--r-- | app/controllers/admin/domain_blocks_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/domain_blocks_controller.rb b/app/controllers/admin/domain_blocks_controller.rb index 377cac8ad..7129656da 100644 --- a/app/controllers/admin/domain_blocks_controller.rb +++ b/app/controllers/admin/domain_blocks_controller.rb @@ -17,7 +17,7 @@ module Admin if existing_domain_block.present? && !@domain_block.stricter_than?(existing_domain_block) @domain_block.save - flash[:alert] = I18n.t('admin.domain_blocks.existing_domain_block_html', name: existing_domain_block.domain, unblock_url: admin_domain_block_path(existing_domain_block)).html_safe # rubocop:disable Rails/OutputSafety + flash.now[:alert] = I18n.t('admin.domain_blocks.existing_domain_block_html', name: existing_domain_block.domain, unblock_url: admin_domain_block_path(existing_domain_block)).html_safe # rubocop:disable Rails/OutputSafety @domain_block.errors[:domain].clear render :new else |