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
73794fc4
Commit
73794fc4
authored
Dec 21, 2020
by
Jarka Košanová
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove swimlanes licensed feateru flag
parent
0794f930
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
47 deletions
+0
-47
config/initializers/0_inject_feature_flags.rb
config/initializers/0_inject_feature_flags.rb
+0
-39
ee/config/feature_flags/licensed/swimlanes.yml
ee/config/feature_flags/licensed/swimlanes.yml
+0
-8
No files found.
config/initializers/0_inject_feature_flags.rb
View file @
73794fc4
...
...
@@ -4,42 +4,3 @@
Feature
.
register_feature_groups
Feature
.
register_definitions
Feature
.
register_hot_reloader
unless
Rails
.
configuration
.
cache_classes
# This disallows usage of licensed feature names with the same name
# as feature flags. This naming collision creates confusion and it was
# decided to be removed in favor of explicit check.
# https://gitlab.com/gitlab-org/gitlab/-/issues/259611
if
Gitlab
.
ee?
&&
Gitlab
.
dev_or_test_env?
# These are the names of feature flags that do violate the constraint of
# being unique to licensed names. These feature flags should be reworked to
# be "development" with explicit check
IGNORED_FEATURE_FLAGS
=
%i[
swimlanes
]
.
to_set
# First, we validate a list of overrides to ensure that these overrides
# are removed if feature flag is gone
missing_feature_flags
=
IGNORED_FEATURE_FLAGS
.
reject
do
|
feature_flag
|
Feature
::
Definition
.
definitions
[
feature_flag
]
end
if
missing_feature_flags
.
any?
raise
"The following feature flags were added as an override for discovering licensed features. "
\
"Since these feature flags seems to be gone, ensure to remove them from
\`
IGNORED_FEATURE_FLAGS
\`
"
\
"in
\`
#{
__FILE__
}
'`:
#{
missing_feature_flags
.
join
(
", "
)
}
"
end
# Second, we validate that there's no feature flag under the name as licensed feature
# flag, to ensure that the name used, is unique
licensed_features
=
License
::
PLANS_BY_FEATURE
.
keys
.
select
do
|
licensed_feature_name
|
IGNORED_FEATURE_FLAGS
.
exclude?
(
licensed_feature_name
)
&&
Feature
::
Definition
.
definitions
[
licensed_feature_name
]
end
if
licensed_features
.
any?
raise
"The following feature flags do use a licensed feature. "
\
"To avoid the confusion between their usage it is disallowed to use feature flag "
\
"with exact the same name as licensed feature name. Use a different name to create "
\
"a distinction:
#{
licensed_features
.
join
(
", "
)
}
"
end
end
ee/config/feature_flags/licensed/swimlanes.yml
deleted
100644 → 0
View file @
0794f930
---
name
:
swimlanes
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41543
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/273362
milestone
:
'
13.5'
type
:
licensed
group
:
group::product planning
default_enabled
:
true
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