From: Thibaut Girka Date: Thu, 18 Apr 2019 22:47:23 +0000 (+0200) Subject: Fix keybase indication on dashboard X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=93199c9566ae8ae7a5a87b8567fec27f0f34b364;p=mastodon.git Fix keybase indication on dashboard --- diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb index f23ed1508..aedfeb70e 100644 --- a/app/controllers/admin/dashboard_controller.rb +++ b/app/controllers/admin/dashboard_controller.rb @@ -30,6 +30,7 @@ module Admin @trending_hashtags = TrendingTags.get(7) @profile_directory = Setting.profile_directory @timeline_preview = Setting.timeline_preview + @keybase_integration = Setting.enable_keybase end private diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml index 21bdcae04..76dbf4388 100644 --- a/app/views/admin/dashboard/index.html.haml +++ b/app/views/admin/dashboard/index.html.haml @@ -50,7 +50,7 @@ %li = feature_hint(link_to(t('admin.dashboard.feature_timeline_preview'), edit_admin_settings_path), @timeline_preview) %li - = feature_hint(link_to(t('admin.dashboard.keybase'), edit_admin_settings_path), @timeline_preview) + = feature_hint(link_to(t('admin.dashboard.keybase'), edit_admin_settings_path), @keybase_integration) %li = feature_hint(link_to(t('admin.dashboard.feature_relay'), admin_relays_path), @relay_enabled)