about summary refs log tree commit diff
path: root/app/views/admin/dashboard/index.html.haml
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-08-07 13:56:48 +0200
committerThibaut Girka <thib@sitedethib.com>2019-08-07 13:56:48 +0200
commit04534604c654060eca24628247fdb51b7ff5372a (patch)
treef8ae222e84056fb2674d23187e66517da1fc2af9 /app/views/admin/dashboard/index.html.haml
parent8400ddca7155005ab79485ed6054c04ea3ca5667 (diff)
parentac33f1aedd9a6c72c6c176afb1f5d62a1ce5d44d (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/views/admin/dashboard/index.html.haml
- config/locales/simple_form.en.yml
Diffstat (limited to 'app/views/admin/dashboard/index.html.haml')
-rw-r--r--app/views/admin/dashboard/index.html.haml6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index d3ac3ff42..3c98da35f 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -52,6 +52,8 @@
         %li
           = feature_hint(link_to(t('admin.dashboard.keybase'), edit_admin_settings_path), @keybase_integration)
         %li
+          = feature_hint(link_to(t('admin.dashboard.trends'), edit_admin_settings_path), @trends_enabled)
+        %li
           = feature_hint(link_to(t('admin.dashboard.feature_relay'), admin_relays_path), @relay_enabled)
         %li
           = feature_hint(link_to(t('admin.dashboard.feature_spam_check'), edit_admin_settings_path), @spam_check_enabled)
@@ -93,6 +95,10 @@
         %li
           = feature_hint(t('admin.dashboard.single_user_mode'), @single_user_mode)
         %li
+          = feature_hint(t('admin.dashboard.authorized_fetch_mode'), @authorized_fetch)
+        %li
+          = feature_hint(t('admin.dashboard.whitelist_mode'), @whitelist_mode)
+        %li
           = feature_hint('LDAP', @ldap_enabled)
         %li
           = feature_hint('CAS', @cas_enabled)