diff options
| author | Reverite <github@reverite.sh> | 2019-08-08 10:06:09 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-08-08 10:06:09 -0700 |
| commit | 9528d3eda280ffac20a18c6f21bfc51f594e2c86 (patch) | |
| tree | 0b6f5b980996b2d16c2dcdd5b932075812753098 /app/views/settings/preferences | |
| parent | 7a312a38f904e853f5703a0b678d0aec83fa858c (diff) | |
| parent | aa485d6f055b93fd7a9df8b47ed96122b38af39e (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/views/settings/preferences')
| -rw-r--r-- | app/views/settings/preferences/appearance/show.html.haml | 5 | ||||
| -rw-r--r-- | app/views/settings/preferences/notifications/show.html.haml | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/app/views/settings/preferences/appearance/show.html.haml b/app/views/settings/preferences/appearance/show.html.haml index 447958253..0bda49f44 100644 --- a/app/views/settings/preferences/appearance/show.html.haml +++ b/app/views/settings/preferences/appearance/show.html.haml @@ -22,6 +22,11 @@ = f.input :setting_reduce_motion, as: :boolean, wrapper: :with_label = f.input :setting_system_font_ui, as: :boolean, wrapper: :with_label + %h4= t 'appearance.discovery' + + .fields-group + = f.input :setting_trends, as: :boolean, wrapper: :with_label + %h4= t 'appearance.confirmation_dialogs' .fields-group diff --git a/app/views/settings/preferences/notifications/show.html.haml b/app/views/settings/preferences/notifications/show.html.haml index acc646fc3..f666ae4ff 100644 --- a/app/views/settings/preferences/notifications/show.html.haml +++ b/app/views/settings/preferences/notifications/show.html.haml @@ -15,6 +15,7 @@ - if current_user.staff? = ff.input :report, as: :boolean, wrapper: :with_label = ff.input :pending_account, as: :boolean, wrapper: :with_label + = ff.input :trending_tag, as: :boolean, wrapper: :with_label .fields-group = f.simple_fields_for :notification_emails, hash_to_object(current_user.settings.notification_emails) do |ff| |