about summary refs log tree commit diff
path: root/app/views
diff options
context:
space:
mode:
authorAlice Gaudon <alice@gaudon.pro>2019-12-16 23:55:50 +0100
committerEugen Rochko <eugen@zeonfederated.com>2019-12-16 23:55:50 +0100
commit668f6980774e124a1cc4c80b280172de04ca7973 (patch)
treeece84f2b41a9937c0273df1f212e49ae460682d4 /app/views
parent8094955461419661b88a0361a5d7caed4b19c29a (diff)
Admin setting to disable default follows (#12566)
Diffstat (limited to 'app/views')
-rw-r--r--app/views/admin/settings/edit.html.haml7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/views/admin/settings/edit.html.haml b/app/views/admin/settings/edit.html.haml
index 6282bb39c..d7b493051 100644
--- a/app/views/admin/settings/edit.html.haml
+++ b/app/views/admin/settings/edit.html.haml
@@ -1,3 +1,6 @@
+- content_for :header_tags do
+  = javascript_pack_tag 'admin', integrity: true, async: true, crossorigin: 'anonymous'
+
 - content_for :page_title do
   = t('admin.settings.title')
 
@@ -38,7 +41,9 @@
   %hr.spacer/
 
   .fields-group
-    = f.input :bootstrap_timeline_accounts, wrapper: :with_block_label, label: t('admin.settings.bootstrap_timeline_accounts.title'), hint: t('admin.settings.bootstrap_timeline_accounts.desc_html')
+    = f.input :enable_bootstrap_timeline_accounts, as: :boolean, wrapper: :with_label, label: t('admin.settings.enable_bootstrap_timeline_accounts.title')
+  .fields-group
+    = f.input :bootstrap_timeline_accounts, wrapper: :with_block_label, label: t('admin.settings.bootstrap_timeline_accounts.title'), hint: t('admin.settings.bootstrap_timeline_accounts.desc_html'), disabled: !Setting.enable_bootstrap_timeline_accounts
 
   %hr.spacer/