Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
952653cc
Commit
952653cc
authored
Jan 26, 2022
by
Maxime Orefice
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove ci_runner_projects_disable_joins feature flag
Changelog: other
parent
3736bc11
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
19 deletions
+1
-19
app/models/ci/runner.rb
app/models/ci/runner.rb
+1
-1
config/feature_flags/development/ci_runner_projects_disable_joins.yml
...re_flags/development/ci_runner_projects_disable_joins.yml
+0
-8
spec/models/ci/runner_spec.rb
spec/models/ci/runner_spec.rb
+0
-10
No files found.
app/models/ci/runner.rb
View file @
952653cc
...
@@ -67,7 +67,7 @@ module Ci
...
@@ -67,7 +67,7 @@ module Ci
has_many
:builds
has_many
:builds
has_many
:runner_projects
,
inverse_of: :runner
,
autosave:
true
,
dependent: :destroy
# rubocop:disable Cop/ActiveRecordDependent
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
:runner_namespaces
,
inverse_of: :runner
,
autosave:
true
has_many
:groups
,
through: :runner_namespaces
,
disable_joins:
true
has_many
:groups
,
through: :runner_namespaces
,
disable_joins:
true
...
...
config/feature_flags/development/ci_runner_projects_disable_joins.yml
deleted
100644 → 0
View file @
3736bc11
---
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
spec/models/ci/runner_spec.rb
View file @
952653cc
...
@@ -31,16 +31,6 @@ RSpec.describe Ci::Runner do
...
@@ -31,16 +31,6 @@ RSpec.describe Ci::Runner do
expect
(
runner
.
projects
.
count
).
to
eq
(
1
)
expect
(
runner
.
projects
.
count
).
to
eq
(
1
)
end
end
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
end
describe
'validation'
do
describe
'validation'
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment