diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-09-03 14:33:06 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-09-03 14:33:06 +0200 |
| commit | 6c233a04a04f674b1be75ce7c6c4547c7a006797 (patch) | |
| tree | 24b32d52e098fac57e91fd26be1311b7b677c9c9 /app/views | |
| parent | e915bc3e9e32e34bf80d1bd66ee3f80d2ca37969 (diff) | |
| parent | ccc2f608c5c1caac2ea4796f4490f29d59d67068 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: README.md Discarded upstream changes to the README, kept our version.
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/settings/notifications/show.html.haml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/views/settings/notifications/show.html.haml b/app/views/settings/notifications/show.html.haml index b718b62df..8aaac043b 100644 --- a/app/views/settings/notifications/show.html.haml +++ b/app/views/settings/notifications/show.html.haml @@ -12,6 +12,9 @@ = ff.input :favourite, as: :boolean, wrapper: :with_label = ff.input :mention, as: :boolean, wrapper: :with_label + - if current_user.staff? + = ff.input :report, as: :boolean, wrapper: :with_label + .fields-group = f.simple_fields_for :notification_emails, hash_to_object(current_user.settings.notification_emails) do |ff| = ff.input :digest, as: :boolean, wrapper: :with_label |