about summary refs log tree commit diff
path: root/app/views/admin
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-10-09 12:11:14 +0200
committerGitHub <noreply@github.com>2018-10-09 12:11:14 +0200
commit4134a10549a833ad5ab18b3c579304919d594ce1 (patch)
tree696f4b453ad029ffda3d0925c484c11b27b95cc6 /app/views/admin
parentd0b1369a853dc2e5b7934c148547f71f8d103859 (diff)
parentb368d3c15ddfca983e89ff2858f7f03eb7147d83 (diff)
Merge pull request #770 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/admin')
-rw-r--r--app/views/admin/settings/edit.html.haml2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/admin/settings/edit.html.haml b/app/views/admin/settings/edit.html.haml
index b4abbf815..361e249e0 100644
--- a/app/views/admin/settings/edit.html.haml
+++ b/app/views/admin/settings/edit.html.haml
@@ -26,6 +26,8 @@
       = f.input :thumbnail, as: :file, wrapper: :with_block_label, label: t('admin.settings.thumbnail.title'), hint: t('admin.settings.thumbnail.desc_html')
     .fields-row__column.fields-row__column-6.fields-group
       = f.input :hero, as: :file, wrapper: :with_block_label, label: t('admin.settings.hero.title'), hint: t('admin.settings.hero.desc_html')
+    .fields-row__column.fields-row__column-6.fields-group
+      = f.input :mascot, as: :file, wrapper: :with_block_label, label: t('admin.settings.mascot.title'), hint: t('admin.settings.mascot.desc_html')
 
   %hr.spacer/