Commit 5637d05d authored by Kerri Miller's avatar Kerri Miller

Merge branch 'mo-feature-flag-enable-ci_runner-projects-disable-joins' into 'master'

Remove ci_runner_projects_disable_joins feature flag

See merge request gitlab-org/gitlab!79196
parents eb762fe4 952653cc
......@@ -67,7 +67,7 @@ module Ci
has_many :builds
has_many :runner_projects, inverse_of: :runner, autosave: true, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent
has_many :projects, through: :runner_projects, disable_joins: -> { ::Feature.enabled?(:ci_runner_projects_disable_joins, default_enabled: :yaml) }
has_many :projects, through: :runner_projects, disable_joins: true
has_many :runner_namespaces, inverse_of: :runner, autosave: true
has_many :groups, through: :runner_namespaces, disable_joins: true
......
---
name: ci_runner_projects_disable_joins
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78372
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350538
milestone: '14.8'
type: development
group: group::pipeline execution
default_enabled: false
......@@ -31,16 +31,6 @@ RSpec.describe Ci::Runner do
expect(runner.projects.count).to eq(1)
end
end
context 'when ci_runner_projects_disable_joins is disabled' do
before do
stub_feature_flags(ci_runner_projects_disable_joins: false)
end
it 'creates a cross-database query' do
expect { runner.projects.count }.to raise_error(Database::PreventCrossJoins::CrossJoinAcrossUnsupportedTablesError)
end
end
end
describe 'validation' 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