diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-07-17 23:10:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-17 23:10:31 +0200 |
| commit | ab1488a6ad93f572e1d184cb9653f76fd408474f (patch) | |
| tree | f1dd126f4745eb99243f390169fb957a72f5acc6 /app/models/form/admin_settings.rb | |
| parent | 325ebb76b19bd20e1b76d8bc26c11cab02f6571c (diff) | |
| parent | 6c0d73a675d62f676b005c06593fd69e9a7bc0e5 (diff) | |
Merge pull request #1804 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/form/admin_settings.rb')
| -rw-r--r-- | app/models/form/admin_settings.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb index 5627f8a84..4c100ba6b 100644 --- a/app/models/form/admin_settings.rb +++ b/app/models/form/admin_settings.rb @@ -15,11 +15,9 @@ class Form::AdminSettings closed_registrations_message open_deletion timeline_preview - show_staff_badge bootstrap_timeline_accounts flavour skin - min_invite_role activity_api_enabled peers_api_enabled show_known_fediverse_at_about_page @@ -47,7 +45,6 @@ class Form::AdminSettings BOOLEAN_KEYS = %i( open_deletion timeline_preview - show_staff_badge activity_api_enabled peers_api_enabled show_known_fediverse_at_about_page @@ -79,7 +76,6 @@ class Form::AdminSettings validates :site_short_description, :site_description, html: { wrap_with: :p } validates :site_extended_description, :site_terms, :closed_registrations_message, html: true validates :registrations_mode, inclusion: { in: %w(open approved none) } - validates :min_invite_role, inclusion: { in: %w(disabled user moderator admin) } validates :site_contact_email, :site_contact_username, presence: true validates :site_contact_username, existing_username: true validates :bootstrap_timeline_accounts, existing_username: { multiple: true } |