about summary refs log tree commit diff
path: root/app/views/admin/settings
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-03-23 22:10:51 +0100
committerThibaut Girka <thib@sitedethib.com>2019-03-26 16:01:59 +0100
commitfcce135d271276aa38576ed36a113ec3f6161e0a (patch)
treef8faef20945cd7f114d8b718c46901fb10fd3c0f /app/views/admin/settings
parent9f56511860493b770c2e535be0f8ce4777c8d373 (diff)
parent9ec98893f4974bb022a722c3163a7e578b1d5ce9 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/admin/settings_controller.rb
- app/models/form/admin_settings.rb

Conflicts caused by upstream refactoring, while we have
flavours and skins, with the flavour_and_skin pseudo-setting.
Diffstat (limited to 'app/views/admin/settings')
-rw-r--r--app/views/admin/settings/edit.html.haml1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/views/admin/settings/edit.html.haml b/app/views/admin/settings/edit.html.haml
index 9995e0b2a..475fb3a2f 100644
--- a/app/views/admin/settings/edit.html.haml
+++ b/app/views/admin/settings/edit.html.haml
@@ -2,6 +2,7 @@
   = t('admin.settings.title')
 
 = simple_form_for @admin_settings, url: admin_settings_path, html: { method: :patch } do |f|
+  = render 'shared/error_messages', object: @admin_settings
 
   .fields-group
     = f.input :site_title, wrapper: :with_label, label: t('admin.settings.site_title')