diff options
| author | Starfall <us@starfall.systems> | 2022-03-08 17:55:38 -0600 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2022-03-08 17:55:38 -0600 |
| commit | 239d67fc2c0ec82617de50a9831bc1a9efc30ecc (patch) | |
| tree | a6806025fe9e094994366434b08093cee5923557 /app/views/settings | |
| parent | ad1733ea294c6049336a9aeeb7ff96c8fea22cfa (diff) | |
| parent | 02133866e6915e37431298b396e1aded1e4c44c5 (diff) | |
Merge remote-tracking branch 'glitch/main'
Diffstat (limited to 'app/views/settings')
| -rw-r--r-- | app/views/settings/preferences/notifications/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/settings/preferences/other/show.html.haml | 3 | ||||
| -rw-r--r-- | app/views/settings/profiles/show.html.haml | 5 |
3 files changed, 6 insertions, 4 deletions
diff --git a/app/views/settings/preferences/notifications/show.html.haml b/app/views/settings/preferences/notifications/show.html.haml index 223e5d740..e01cd077f 100644 --- a/app/views/settings/preferences/notifications/show.html.haml +++ b/app/views/settings/preferences/notifications/show.html.haml @@ -24,6 +24,8 @@ = ff.input :appeal, as: :boolean, wrapper: :with_label = ff.input :pending_account, as: :boolean, wrapper: :with_label = ff.input :trending_tag, as: :boolean, wrapper: :with_label + = ff.input :trending_link, as: :boolean, wrapper: :with_label + = ff.input :trending_status, as: :boolean, wrapper: :with_label .fields-group = f.simple_fields_for :notification_emails, hash_to_object(current_user.settings.notification_emails) do |ff| diff --git a/app/views/settings/preferences/other/show.html.haml b/app/views/settings/preferences/other/show.html.haml index 1f922a5c6..a63b1193b 100644 --- a/app/views/settings/preferences/other/show.html.haml +++ b/app/views/settings/preferences/other/show.html.haml @@ -11,9 +11,6 @@ = 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_aggregate_reblogs, as: :boolean, wrapper: :with_label - unless Setting.hide_followers_count diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml index 21948b200..b84d06c27 100644 --- a/app/views/settings/profiles/show.html.haml +++ b/app/views/settings/profiles/show.html.haml @@ -30,7 +30,10 @@ = f.input :bot, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.bot') .fields-group - = f.input :discoverable, as: :boolean, wrapper: :with_label, hint: t(Setting.profile_directory ? 'simple_form.hints.defaults.discoverable' : 'simple_form.hints.defaults.discoverable_no_directory'), recommended: true + = f.input :discoverable, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.discoverable'), recommended: true + + .fields-group + = f.input :hide_collections, as: :boolean, wrapper: :with_label, label: t('simple_form.labels.defaults.setting_hide_network'), hint: t('simple_form.hints.defaults.setting_hide_network') %hr.spacer/ |