diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
tree | 544930fb309b30317ae9797a9683768705d664c4 /app/finders/feature_flags_finder.rb | |
parent | 4b1de649d0168371549608993deac953eb692019 (diff) |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'app/finders/feature_flags_finder.rb')
-rw-r--r-- | app/finders/feature_flags_finder.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/finders/feature_flags_finder.rb b/app/finders/feature_flags_finder.rb index 9cb3bf7fa23..7b38841970d 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 Feature.enabled?(:feature_flags_new_version, project, default_enabled: true) - project.operations_feature_flags - else - project.operations_feature_flags.legacy_flag - end + project.operations_feature_flags end def by_scope(items) |