diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-08-06 13:16:53 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-08-06 13:16:53 +0200 |
commit | cad2e6eb7afe96f781175cd829b70a0667d3498a (patch) | |
tree | 7efda6a7ca7dbe62d6efa42b17c1167e751c44d3 /app/views/settings/preferences | |
parent | 3ea7a334d89d2c4075b1dbf649d692ff49325f2e (diff) | |
parent | 1d8d553d8b5cb23cc67bd530ca9eb70a6683ab2a (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/views/settings/preferences')
-rw-r--r-- | app/views/settings/preferences/notifications/show.html.haml | 1 |
1 files changed, 1 insertions, 0 deletions
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| |