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
62d924da
Commit
62d924da
authored
Apr 26, 2021
by
Mario Celi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove optimized_timebox_queries feature flag
- Remove relevant code - Update relevant specs Changelog: other
parent
7d524985
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
28 deletions
+7
-28
app/models/concerns/timebox.rb
app/models/concerns/timebox.rb
+1
-5
changelogs/unreleased/mr-34043-remove-optimized_timebox_queries-ff.yml
...released/mr-34043-remove-optimized_timebox_queries-ff.yml
+5
-0
config/feature_flags/development/optimized_timebox_queries.yml
...g/feature_flags/development/optimized_timebox_queries.yml
+0
-8
spec/models/milestone_spec.rb
spec/models/milestone_spec.rb
+1
-15
No files found.
app/models/concerns/timebox.rb
View file @
62d924da
...
...
@@ -72,11 +72,7 @@ module Timebox
groups
=
groups
.
compact
if
groups
.
is_a?
Array
groups
=
[]
if
groups
.
nil?
if
Feature
.
enabled?
(
:optimized_timebox_queries
,
default_enabled:
true
)
from_union
([
where
(
project_id:
projects
),
where
(
group_id:
groups
)],
remove_duplicates:
false
)
else
where
(
project_id:
projects
).
or
(
where
(
group_id:
groups
))
end
from_union
([
where
(
project_id:
projects
),
where
(
group_id:
groups
)],
remove_duplicates:
false
)
end
# A timebox is within the timeframe (start_date, end_date) if it overlaps
...
...
changelogs/unreleased/mr-34043-remove-optimized_timebox_queries-ff.yml
0 → 100644
View file @
62d924da
---
title
:
Remove optimized_timebox_queries feature flag
merge_request
:
60326
author
:
type
:
other
config/feature_flags/development/optimized_timebox_queries.yml
deleted
100644 → 0
View file @
7d524985
---
name
:
optimized_timebox_queries
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/32953
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/34043
milestone
:
'
13.1'
type
:
development
group
:
group::project management
default_enabled
:
true
spec/models/milestone_spec.rb
View file @
62d924da
...
...
@@ -293,21 +293,7 @@ RSpec.describe Milestone do
end
end
context
'when `optimized_timebox_queries` feature flag is enabled'
do
before
do
stub_feature_flags
(
optimized_timebox_queries:
true
)
end
it_behaves_like
'#for_projects_and_groups'
end
context
'when `optimized_timebox_queries` feature flag is disabled'
do
before
do
stub_feature_flags
(
optimized_timebox_queries:
false
)
end
it_behaves_like
'#for_projects_and_groups'
end
it_behaves_like
'#for_projects_and_groups'
describe
'.upcoming_ids'
do
let
(
:group_1
)
{
create
(
:group
)
}
...
...
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