diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-07-19 23:37:41 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-07-19 23:37:41 +0200 |
| commit | 055450bc02732f654317096f56b03b77f5b84270 (patch) | |
| tree | 1b3dd84f1bdc3bfd1ce95a2b0552819ced3e159e /app/controllers/admin | |
| parent | 86d446194823a416a99c5b4657f4684fb0e07ae9 (diff) | |
| parent | c37c1da41e1c490771a409ad1b12f3db55af4cee (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/controllers/admin')
| -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 |