diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-15 15:10:11 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-15 15:10:11 +0300 |
| commit | 96acc69fae1ee7d559ba7eaa4e8304c8261525e3 (patch) | |
| tree | b1ed433da35a415cab8ed544d85ac4c939efab0e /app/finders | |
| parent | a1498861799d1695682d72870580a6c3fb5ca3cf (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/finders')
| -rw-r--r-- | app/finders/feature_flags_finder.rb | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/app/finders/feature_flags_finder.rb b/app/finders/feature_flags_finder.rb index 0ab65d3630e..20b18c62f7a 100644 --- a/app/finders/feature_flags_finder.rb +++ b/app/finders/feature_flags_finder.rb @@ -24,11 +24,7 @@ class FeatureFlagsFinder private def feature_flags - if exclude_legacy_flags? - project.operations_feature_flags.new_version_only - else - project.operations_feature_flags - end + project.operations_feature_flags.new_version_only end def by_scope(items) @@ -41,9 +37,4 @@ class FeatureFlagsFinder items end end - - def exclude_legacy_flags? - Feature.enabled?(:remove_legacy_flags, project, default_enabled: :yaml) && - Feature.disabled?(:remove_legacy_flags_override, project, default_enabled: :yaml) - end end |