diff options
| author | Reverite <github@reverite.sh> | 2019-08-20 10:46:41 -0600 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-08-20 10:46:41 -0600 |
| commit | d2c357ba86b1a9d1b7b4c291e1c55811997027ed (patch) | |
| tree | 229bd4223833900f11701fb232f6ea7b2e4160f1 /app/models/form/admin_settings.rb | |
| parent | 2e221bd5b6472d1eecb654b3518af7886d3dadaf (diff) | |
| parent | bce46f2057b06e78958a42821f3ce18c945de88d (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/models/form/admin_settings.rb')
| -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 |