treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix keybase indication on dashboard

remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
Thibaut Girka 2019-04-19 00:47:23 +02:00 committed by ThibG
parent d83068016b
commit 93199c9566
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/admin/dashboard_controller.rb
View File

@ -30,6 +30,7 @@ module Admin
@trending_hashtags = TrendingTags.get(7) @trending_hashtags = TrendingTags.get(7)
@profile_directory = Setting.profile_directory @profile_directory = Setting.profile_directory
@timeline_preview = Setting.timeline_preview @timeline_preview = Setting.timeline_preview
@keybase_integration = Setting.enable_keybase
end end
private private

2
app/views/admin/dashboard/index.html.haml
View File

@ -50,7 +50,7 @@
%li %li
= feature_hint(link_to(t('admin.dashboard.feature_timeline_preview'), edit_admin_settings_path), @timeline_preview) = feature_hint(link_to(t('admin.dashboard.feature_timeline_preview'), edit_admin_settings_path), @timeline_preview)
%li %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 %li
= feature_hint(link_to(t('admin.dashboard.feature_relay'), admin_relays_path), @relay_enabled) = feature_hint(link_to(t('admin.dashboard.feature_relay'), admin_relays_path), @relay_enabled)