diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-04 00:07:29 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-04 00:07:29 +0300 |
| commit | 1da3754b25657f49afdcb0b942506d365b1ee89d (patch) | |
| tree | 9f4bfa94fdd1762ef99e6a61bf180ac8cd7b5616 /app/helpers/groups_helper.rb | |
| parent | 25521def84a6987fe9d4265b560e930bfb32c195 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/groups_helper.rb')
| -rw-r--r-- | app/helpers/groups_helper.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index 601560cca92..9cba87ac444 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -32,8 +32,7 @@ module GroupsHelper end def can_disable_group_emails?(group) - Feature.enabled?(:emails_disabled, group, default_enabled: true) && - can?(current_user, :set_emails_disabled, group) && !group.parent&.emails_disabled? + can?(current_user, :set_emails_disabled, group) && !group.parent&.emails_disabled? end def group_issues_count(state:) |