diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-03-23 10:15:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-23 10:15:13 +0100 |
| commit | 867790e07a149b1213936c3ff1fc5815d37e2e94 (patch) | |
| tree | d165b5ba19e907a8e57b1abf5ab5cf408419e051 /app/controllers/admin/email_domain_blocks_controller.rb | |
| parent | 02ac94490a67659c7cc669ead5b107b724db6e68 (diff) | |
| parent | b4f60bc6de4ece3b2ff908d31a0c34ddbbfacf2c (diff) | |
Merge pull request #2144 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/admin/email_domain_blocks_controller.rb')
| -rw-r--r-- | app/controllers/admin/email_domain_blocks_controller.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/app/controllers/admin/email_domain_blocks_controller.rb b/app/controllers/admin/email_domain_blocks_controller.rb index a0a43de19..4a3228ec3 100644 --- a/app/controllers/admin/email_domain_blocks_controller.rb +++ b/app/controllers/admin/email_domain_blocks_controller.rb @@ -2,8 +2,6 @@ module Admin class EmailDomainBlocksController < BaseController - before_action :set_email_domain_block, only: [:show, :destroy] - def index authorize :email_domain_block, :index? @@ -59,10 +57,6 @@ module Admin private - def set_email_domain_block - @email_domain_block = EmailDomainBlock.find(params[:id]) - end - def set_resolved_records Resolv::DNS.open do |dns| dns.timeouts = 5 |