diff options
| author | Reverite <github@reverite.sh> | 2019-04-12 01:38:18 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-04-12 01:38:18 -0700 |
| commit | e10a9794f4ed7c90e3190f285359f55dd00da435 (patch) | |
| tree | 579ebf95d6bbf091d05e66907a9c8168c926e0af /app/views/settings | |
| parent | ff736905fa534f7189e57c1d0c14fbac45f239a1 (diff) | |
| parent | bb50ec2e6687238ad8b2ec545a73270fee7a7b09 (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/views/settings')
| -rw-r--r-- | app/views/settings/notifications/show.html.haml | 1 | ||||
| -rw-r--r-- | app/views/settings/preferences/show.html.haml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/views/settings/notifications/show.html.haml b/app/views/settings/notifications/show.html.haml index 8aaac043b..6ec57b502 100644 --- a/app/views/settings/notifications/show.html.haml +++ b/app/views/settings/notifications/show.html.haml @@ -14,6 +14,7 @@ - if current_user.staff? = ff.input :report, as: :boolean, wrapper: :with_label + = ff.input :pending_account, 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/show.html.haml b/app/views/settings/preferences/show.html.haml index c666bafb5..a50f33517 100644 --- a/app/views/settings/preferences/show.html.haml +++ b/app/views/settings/preferences/show.html.haml @@ -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 |