summaryrefslogtreecommitdiff
path: root/app/views/groups
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-03 12:06:34 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-03 12:06:34 +0000
commitcd4cb29b2c304f00d238ee72fe40c767cb3e2675 (patch)
tree4dba0f038795f8d8f43ed807a1b7f58af27b61a9 /app/views/groups
parent2b339d4e892045d1d7be117d1557a5394ebd6e72 (diff)
downloadgitlab-ce-cd4cb29b2c304f00d238ee72fe40c767cb3e2675.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/groups')
-rw-r--r--app/views/groups/settings/_permissions.html.haml7
1 files changed, 7 insertions, 0 deletions
diff --git a/app/views/groups/settings/_permissions.html.haml b/app/views/groups/settings/_permissions.html.haml
index 4c88660ccb9..618cfe57be4 100644
--- a/app/views/groups/settings/_permissions.html.haml
+++ b/app/views/groups/settings/_permissions.html.haml
@@ -23,6 +23,13 @@
%span.d-block= s_('GroupSettings|Disable email notifications')
%span.text-muted= s_('GroupSettings|This setting will override user notification preferences for all members of the group, subgroups, and projects.')
+ .form-group.append-bottom-default
+ .form-check
+ = f.check_box :mentions_disabled, checked: @group.mentions_disabled?, class: 'form-check-input'
+ = f.label :mentions_disabled, class: 'form-check-label' do
+ %span.d-block= s_('GroupSettings|Disable group mentions')
+ %span.text-muted= s_('GroupSettings|This setting will prevent group members from being notified if the group is mentioned.')
+
= render_if_exists 'groups/settings/ip_restriction', f: f, group: @group
= render_if_exists 'groups/settings/allowed_email_domain', f: f, group: @group
= render 'groups/settings/lfs', f: f