Merge tag 'v2.8.0' into instance_only_statuses
This commit is contained in:
@ -6,6 +6,7 @@
|
||||
%li= link_to t('preferences.publishing'), '#settings_publishing'
|
||||
%li= link_to t('preferences.other'), '#settings_other'
|
||||
%li= link_to t('preferences.web'), '#settings_web'
|
||||
%li= link_to t('settings.notifications'), settings_notifications_path
|
||||
|
||||
= simple_form_for current_user, url: settings_preferences_path, html: { method: :put } do |f|
|
||||
= render 'shared/error_messages', object: current_user
|
||||
@ -28,12 +29,17 @@
|
||||
|
||||
= f.input :setting_default_federation, as: :boolean, wrapper: :with_label
|
||||
|
||||
%hr#settings_other/
|
||||
|
||||
.fields-group
|
||||
= f.input :setting_noindex, as: :boolean, wrapper: :with_label
|
||||
|
||||
.fields-group
|
||||
= f.input :setting_hide_network, as: :boolean, wrapper: :with_label
|
||||
|
||||
.fields-group
|
||||
= f.input :setting_show_application, as: :boolean, wrapper: :with_label
|
||||
|
||||
%hr#settings_web/
|
||||
|
||||
.fields-row
|
||||
|
||||
Reference in New Issue
Block a user