about summary refs log tree commit diff
path: root/app/models/form
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-04-10 09:16:08 +0200
committerThibaut Girka <thib@sitedethib.com>2019-04-10 09:16:08 +0200
commit5085559b15ef1c1fe3742757d00e5651fc52b5b5 (patch)
tree0249b98caced1e39387564f04391eb1a0c39a2d7 /app/models/form
parentcb410f80a40d03b509cec244b0cdd4ed3957c6a0 (diff)
parent830c2a9ccbe98e145640e12637ef3da56f41a7b5 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/views/admin/pending_accounts/index.html.haml
  No real conflict, upstream changes too close to glitch-specific
  theming system changes.
- config/navigation.rb
  Upstream redesigned the settings navigation, took those changes
  and re-inserted the flavours menu.
Diffstat (limited to 'app/models/form')
-rw-r--r--app/models/form/admin_settings.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb
index 5b71dfad5..83d303c33 100644
--- a/app/models/form/admin_settings.rb
+++ b/app/models/form/admin_settings.rb
@@ -57,7 +57,8 @@ class Form::AdminSettings
 
   attr_accessor(*KEYS)
 
-  validates :site_short_description, :site_description, :site_extended_description, :site_terms, :closed_registrations_message, html: true
+  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