techhub/mastodon
2
0
Fork 0
Code Activity

Finish email allow/deny list naming migration (#30530)

Browse Source
This commit is contained in:
Matt Jankowski
2024-08-13 03:37:32 -04:00
committed by GitHub
parent f6d090fdf5
commit 02df1b4e4a
11 changed files with 43 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/user.rb
View File

@@ -100,7 +100,7 @@ class User < ApplicationRecord
validates :email, presence: true, email_address: true
validates_with BlacklistedEmailValidator, if: -> { ENV['EMAIL_DOMAIN_LISTS_APPLY_AFTER_CONFIRMATION'] == 'true' || !confirmed? }
validates_with UserEmailValidator, if: -> { ENV['EMAIL_DOMAIN_LISTS_APPLY_AFTER_CONFIRMATION'] == 'true' || !confirmed? }
validates_with EmailMxValidator, if: :validate_email_dns?
validates :agreement, acceptance: { allow_nil: false, accept: [true, 'true', '1'] }, on: :create