Commit 2c163449 authored by Douglas Barbosa Alexandre's avatar Douglas Barbosa Alexandre

Merge branch '30964-remove-the-emails_disabled-feature-flag' into 'master'

Remove the `:emails_disabled` feature flag...

See merge request gitlab-org/gitlab!18044
parents 437a626b e741068b
...@@ -32,8 +32,7 @@ module GroupsHelper ...@@ -32,8 +32,7 @@ module GroupsHelper
end end
def can_disable_group_emails?(group) 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 end
def group_issues_count(state:) def group_issues_count(state:)
......
...@@ -160,7 +160,7 @@ module ProjectsHelper ...@@ -160,7 +160,7 @@ module ProjectsHelper
def can_disable_emails?(project, current_user) def can_disable_emails?(project, current_user)
return false if project.group&.emails_disabled? return false if project.group&.emails_disabled?
can?(current_user, :set_emails_disabled, project) && Feature.enabled?(:emails_disabled, project, default_enabled: true) can?(current_user, :set_emails_disabled, project)
end end
def last_push_event def last_push_event
......
...@@ -182,7 +182,7 @@ class Namespace < ApplicationRecord ...@@ -182,7 +182,7 @@ class Namespace < ApplicationRecord
# any ancestor can disable emails for all descendants # any ancestor can disable emails for all descendants
def emails_disabled? def emails_disabled?
strong_memoize(:emails_disabled) do strong_memoize(:emails_disabled) do
Feature.enabled?(:emails_disabled, self, default_enabled: true) && self_and_ancestors.where(emails_disabled: true).exists? self_and_ancestors.where(emails_disabled: true).exists?
end end
end end
......
...@@ -664,7 +664,7 @@ class Project < ApplicationRecord ...@@ -664,7 +664,7 @@ class Project < ApplicationRecord
def emails_disabled? def emails_disabled?
strong_memoize(:emails_disabled) do strong_memoize(:emails_disabled) do
# disabling in the namespace overrides the project setting # disabling in the namespace overrides the project setting
Feature.enabled?(:emails_disabled, self, default_enabled: true) && (super || namespace.emails_disabled?) super || namespace.emails_disabled?
end end
end end
......
...@@ -896,32 +896,6 @@ describe Namespace do ...@@ -896,32 +896,6 @@ describe Namespace do
end end
end end
end end
context 'when :emails_disabled feature flag is off' do
before do
stub_feature_flags(emails_disabled: false)
end
context 'when not a subgroup' do
it 'returns false' do
group = create(:group, emails_disabled: true)
expect(group.emails_disabled?).to be_falsey
end
end
context 'when a subgroup and ancestor emails are disabled' do
let(:grandparent) { create(:group) }
let(:parent) { create(:group, parent: grandparent) }
let(:group) { create(:group, parent: parent) }
it 'returns false' do
grandparent.update_attribute(:emails_disabled, true)
expect(group.emails_disabled?).to be_falsey
end
end
end
end end
describe '#pages_virtual_domain' do describe '#pages_virtual_domain' do
......
...@@ -2387,29 +2387,6 @@ describe Project do ...@@ -2387,29 +2387,6 @@ describe Project do
expect(project.emails_disabled?).to be_truthy expect(project.emails_disabled?).to be_truthy
end end
end end
context 'when :emails_disabled feature flag is off' do
before do
stub_feature_flags(emails_disabled: false)
end
context 'emails disabled in group' do
it 'returns false' do
allow(project.namespace).to receive(:emails_disabled?) { true }
expect(project.emails_disabled?).to be_falsey
end
end
context 'emails enabled in group' do
it 'returns false' do
allow(project.namespace).to receive(:emails_disabled?) { false }
project.update_attribute(:emails_disabled, true)
expect(project.emails_disabled?).to be_falsey
end
end
end
end end
describe '#lfs_enabled?' do describe '#lfs_enabled?' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment