diff --git a/config/feature_flags/development/approval_rules_disable_joins.yml b/config/feature_flags/development/approval_rules_disable_joins.yml deleted file mode 100644 index 1ee33b45ba71996fa6fed48af481188d2afe1b91..0000000000000000000000000000000000000000 --- a/config/feature_flags/development/approval_rules_disable_joins.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: approval_rules_disable_joins -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136588 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/431564 -milestone: '16.7' -type: development -group: group::source code -default_enabled: false diff --git a/ee/app/models/concerns/approval_rule_like.rb b/ee/app/models/concerns/approval_rule_like.rb index 8dd968dfb010903102fe5ae44d121e9664a7ccd5..b42344caeff12004981695d725d2ea637de9f500 100644 --- a/ee/app/models/concerns/approval_rule_like.rb +++ b/ee/app/models/concerns/approval_rule_like.rb @@ -24,9 +24,7 @@ module ApprovalRuleLike after_add: :audit_add, after_remove: :audit_remove has_many :group_members, through: :groups - has_many :group_users, -> { - distinct.allow_cross_joins_across_databases(url: "https://gitlab.com/gitlab-org/gitlab/-/issues/417457") - }, through: :groups, source: :users, disable_joins: -> { Feature.enabled?(:approval_rules_disable_joins) } + has_many :group_users, -> { distinct }, through: :groups, source: :users, disable_joins: true belongs_to :security_orchestration_policy_configuration, class_name: 'Security::OrchestrationPolicyConfiguration', optional: true belongs_to :scan_result_policy_read, diff --git a/ee/spec/models/concerns/approval_rule_like_spec.rb b/ee/spec/models/concerns/approval_rule_like_spec.rb index e8532148b9b7817cd17350ac98584dfb769cfcdd..8d228d31c53f3f5df2bbe29268071f1bc44c1083 100644 --- a/ee/spec/models/concerns/approval_rule_like_spec.rb +++ b/ee/spec/models/concerns/approval_rule_like_spec.rb @@ -389,40 +389,6 @@ expect(subject.group_users).to eq([user1]) end - - # TODO: Remove along with the feature flag since without the - # feature flag this test is not useful - context 'when approval_rules_disable_joins feature flag exists' do - context 'and is enabled' do - before do - group1.add_guest(user1) - group2.add_guest(user1) - subject.groups = [group1, group2] - end - - it 'performs a multiple queries' do - subject - - control_count = ActiveRecord::QueryRecorder.new do - subject.group_users.to_a - end - - expect(control_count.count).to eq(4) - end - end - - context 'and is disabled' do - before do - stub_feature_flags(approval_rules_disable_joins: false) - end - - it 'performs a single query' do - subject - - expect { subject.group_users.to_a }.not_to exceed_query_limit(1) - end - end - end end describe '.exportable' do