diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-11-14 21:12:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-14 21:12:57 +0100 |
| commit | fbef909c2a1ff8d24811f76237e62fbef6cc63cc (patch) | |
| tree | 935c852c30ee793ce881a719ae367d49e4a8684a /app/views/settings | |
| parent | c3ec1e87b8c19487c954b0cc571b426b4d5b53fa (diff) | |
Add option to block direct messages from people you don't follow (#5669)
* Add option to block direct messages from people you don't follow Fix #5326 * If the DM responds to a toot by recipient, allow it through * i18n: Update Polish translation (for #5669) (#5673)
Diffstat (limited to 'app/views/settings')
| -rw-r--r-- | app/views/settings/notifications/show.html.haml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/settings/notifications/show.html.haml b/app/views/settings/notifications/show.html.haml index 80cd615c7..b718b62df 100644 --- a/app/views/settings/notifications/show.html.haml +++ b/app/views/settings/notifications/show.html.haml @@ -11,7 +11,7 @@ = ff.input :reblog, as: :boolean, wrapper: :with_label = ff.input :favourite, as: :boolean, wrapper: :with_label = ff.input :mention, 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 @@ -20,6 +20,7 @@ = f.simple_fields_for :interactions, hash_to_object(current_user.settings.interactions) do |ff| = ff.input :must_be_follower, as: :boolean, wrapper: :with_label = ff.input :must_be_following, as: :boolean, wrapper: :with_label + = ff.input :must_be_following_dm, as: :boolean, wrapper: :with_label .actions = f.button :button, t('generic.save_changes'), type: :submit |