diff options
| author | Renato "Lond" Cerqueira <renato@lond.com.br> | 2018-02-04 06:00:10 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-02-04 06:00:10 +0100 |
| commit | 4e4f1b0dcb386464d653fcce765ca775e566a03c (patch) | |
| tree | 890fad0c316342e66179095f00fee3c3ddef50b3 /app/controllers | |
| parent | 26f21fd5a03b1c6407cd81c58481288d06958ad3 (diff) | |
Add option to show only local toots in timeline preview (#6292)
* Add option to show only local toots in timeline preview Right know, toots from all the known fediverse are shown in the main page of an instance. That however doesn't reflect the instance itself. With this option the admin may choose to display only local toots so that users checking the instance get a better idea of internal conversations. * Fix issues pointed by codeclimate and eslint * Add default message for community timeline * Update pl.yml
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/about_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/admin/settings_controller.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/about_controller.rb b/app/controllers/about_controller.rb index 47690e81e..4ffdfb685 100644 --- a/app/controllers/about_controller.rb +++ b/app/controllers/about_controller.rb @@ -31,7 +31,7 @@ class AboutController < ApplicationController def initial_state_params { - settings: {}, + settings: { known_fediverse: Setting.show_known_fediverse_at_about_page }, token: current_session&.token, } end diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb index 487282dc3..a6214dc3f 100644 --- a/app/controllers/admin/settings_controller.rb +++ b/app/controllers/admin/settings_controller.rb @@ -19,6 +19,7 @@ module Admin min_invite_role activity_api_enabled peers_api_enabled + show_known_fediverse_at_about_page ).freeze BOOLEAN_SETTINGS = %w( @@ -28,6 +29,7 @@ module Admin show_staff_badge activity_api_enabled peers_api_enabled + show_known_fediverse_at_about_page ).freeze UPLOAD_SETTINGS = %w( |