diff options
| author | ThibG <thib@sitedethib.com> | 2019-08-06 17:25:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-06 17:25:54 +0200 |
| commit | 8400ddca7155005ab79485ed6054c04ea3ca5667 (patch) | |
| tree | 696f5ae9a70891e96fdf819905b05aa6482bcf07 /app/views/settings | |
| parent | 3ea7a334d89d2c4075b1dbf649d692ff49325f2e (diff) | |
| parent | d10f6036cfeebec5b2c160db8659d2c19d29fe9c (diff) | |
Merge pull request #1191 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/settings')
| -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| |