Merge commit '2f932cb2bb
' into kb_migration
This commit is contained in:
commit
82d61dad96
65 changed files with 909 additions and 162 deletions
|
@ -23,6 +23,6 @@ module Payloadable
|
|||
end
|
||||
|
||||
def signing_enabled?
|
||||
ENV['AUTHORIZED_FETCH'] != 'true' && !Rails.configuration.x.whitelist_mode
|
||||
ENV['AUTHORIZED_FETCH'] != 'true' && !Rails.configuration.x.limited_federation_mode
|
||||
end
|
||||
end
|
||||
|
|
|
@ -4,7 +4,7 @@ class UnallowDomainService < BaseService
|
|||
include DomainControlHelper
|
||||
|
||||
def call(domain_allow)
|
||||
suspend_accounts!(domain_allow.domain) if whitelist_mode?
|
||||
suspend_accounts!(domain_allow.domain) if limited_federation_mode?
|
||||
|
||||
domain_allow.destroy
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue