Merge remote-tracking branch 'parent/main' into upstream-20230105

2024-01-05 10:01:36 +09:00 · 2024-01-05 10:01:36 +09:00 · a0a3d1b101
commit a0a3d1b101
parent 9ff2306821 964a0ecf37
65 changed files with 1008 additions and 453 deletions
--- a/app/controllers/api/v1/admin/email_domain_blocks_controller.rb
+++ b/app/controllers/api/v1/admin/email_domain_blocks_controller.rb
@ -55,7 +55,7 @@ class Api::V1::Admin::EmailDomainBlocksController < Api::BaseController
  end

  def resource_params
-    params.permit(:domain)
+    params.permit(:domain, :allow_with_approval)
  end

  def insert_pagination_headers