diff options
| author | ThibG <thib@sitedethib.com> | 2019-08-20 12:09:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-20 12:09:11 +0200 |
| commit | bce46f2057b06e78958a42821f3ce18c945de88d (patch) | |
| tree | d2ac3d5fc7bfcf13f1dc19a91d42feb8c6a945da /app/models/form | |
| parent | b859eb001717dfc62aebb8eba47b84c75aebe4ef (diff) | |
| parent | fae9e34484e7f68b59e7738edfe7344d3790ddfe (diff) | |
Merge pull request #1199 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/form')
| -rw-r--r-- | app/models/form/admin_settings.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb index 2c3a7f13b..57dd3edd9 100644 --- a/app/models/form/admin_settings.rb +++ b/app/models/form/admin_settings.rb @@ -36,6 +36,8 @@ class Form::AdminSettings show_replies_in_public_timelines spam_check_enabled trends + show_domain_blocks + show_domain_blocks_rationale ).freeze BOOLEAN_KEYS = %i( @@ -74,6 +76,8 @@ class Form::AdminSettings validates :site_contact_email, :site_contact_username, presence: true validates :site_contact_username, existing_username: true validates :bootstrap_timeline_accounts, existing_username: { multiple: true } + validates :show_domain_blocks, inclusion: { in: %w(disabled users all) } + validates :show_domain_blocks_rationale, inclusion: { in: %w(disabled users all) } def initialize(_attributes = {}) super |