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/serializers/rest/admin/email_domain_block_serializer.rb
+++ b/app/serializers/rest/admin/email_domain_block_serializer.rb
@ -1,7 +1,7 @@
 # frozen_string_literal: true

 class REST::Admin::EmailDomainBlockSerializer < ActiveModel::Serializer
-  attributes :id, :domain, :created_at, :history
+  attributes :id, :domain, :created_at, :history, :allow_with_approval

  def id
    object.id.to_s