about summary refs log tree commit diff
path: root/app/views
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-04-28 09:43:45 +0200
committerGitHub <noreply@github.com>2020-04-28 09:43:45 +0200
commitb3d0de8b40fa6a3c86dcf7a432ea031bffd7b5a7 (patch)
treea15bdc06b801a3a3823eacb9cd4fbd34846873d7 /app/views
parentb40d68cc310ada47b498dcde32e025162d9df8b9 (diff)
Fix /public showing public instead of community timeline for logged-in users (#13499)
Diffstat (limited to 'app/views')
-rw-r--r--app/views/public_timelines/show.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/public_timelines/show.html.haml b/app/views/public_timelines/show.html.haml
index 0e4ba877d..5e536a235 100644
--- a/app/views/public_timelines/show.html.haml
+++ b/app/views/public_timelines/show.html.haml
@@ -13,5 +13,5 @@
   - else
     %p= t('about.browse_local_posts')
 
-#mastodon-timeline{ data: { props: Oj.dump(default_props) }}
+#mastodon-timeline{ data: { props: Oj.dump(default_props.merge(local: !Setting.show_known_fediverse_at_about_page)) }}
 #modal-container