Commit ec8466d4 authored by Shinya Maeda's avatar Shinya Maeda

Merge branch 'rollout-new-version-ff' into 'master'

Enable New Version Feature Flags for Self Managed Instances

See merge request gitlab-org/gitlab!35192
parents 47617fff 88900bc6
...@@ -12,7 +12,7 @@ class Projects::FeatureFlagsController < Projects::ApplicationController ...@@ -12,7 +12,7 @@ class Projects::FeatureFlagsController < Projects::ApplicationController
before_action do before_action do
push_frontend_feature_flag(:feature_flag_permissions) push_frontend_feature_flag(:feature_flag_permissions)
push_frontend_feature_flag(:feature_flags_new_version, project) push_frontend_feature_flag(:feature_flags_new_version, project, default_enabled: true)
end end
def index def index
...@@ -103,7 +103,7 @@ class Projects::FeatureFlagsController < Projects::ApplicationController ...@@ -103,7 +103,7 @@ class Projects::FeatureFlagsController < Projects::ApplicationController
end end
def new_version_feature_flags_enabled? def new_version_feature_flags_enabled?
::Feature.enabled?(:feature_flags_new_version, project) ::Feature.enabled?(:feature_flags_new_version, project, default_enabled: true)
end end
def create_params def create_params
......
...@@ -24,7 +24,7 @@ class FeatureFlagsFinder ...@@ -24,7 +24,7 @@ class FeatureFlagsFinder
private private
def feature_flags def feature_flags
if Feature.enabled?(:feature_flags_new_version, project) if Feature.enabled?(:feature_flags_new_version, project, default_enabled: true)
project.operations_feature_flags project.operations_feature_flags
else else
project.operations_feature_flags.legacy_flag project.operations_feature_flags.legacy_flag
......
...@@ -46,7 +46,7 @@ module FeatureFlags ...@@ -46,7 +46,7 @@ module FeatureFlags
end end
def new_version_feature_flags_enabled? def new_version_feature_flags_enabled?
::Feature.enabled?(:feature_flags_new_version, project) ::Feature.enabled?(:feature_flags_new_version, project, default_enabled: true)
end end
end end
end end
---
title: Enable new version feature flags by default
merge_request: 35192
author:
type: added
...@@ -246,7 +246,7 @@ module API ...@@ -246,7 +246,7 @@ module API
end end
def feature_flags_new_version_enabled? def feature_flags_new_version_enabled?
Feature.enabled?(:feature_flags_new_version, user_project) Feature.enabled?(:feature_flags_new_version, user_project, default_enabled: true)
end end
def rename_key(hash, old_key, new_key) def rename_key(hash, old_key, new_key)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment