diff --git a/ee/app/controllers/projects/feature_flags_controller.rb b/ee/app/controllers/projects/feature_flags_controller.rb index 0a1955c66cf82ac123bde4efa1f60fed553433b8..f530f387c81b14d12cbb71002d9ea42345d5793b 100644 --- a/ee/app/controllers/projects/feature_flags_controller.rb +++ b/ee/app/controllers/projects/feature_flags_controller.rb @@ -12,7 +12,7 @@ class Projects::FeatureFlagsController < Projects::ApplicationController before_action do 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 def index @@ -103,7 +103,7 @@ def feature_flag end def new_version_feature_flags_enabled? - ::Feature.enabled?(:feature_flags_new_version, project) + ::Feature.enabled?(:feature_flags_new_version, project, default_enabled: true) end def create_params diff --git a/ee/app/finders/feature_flags_finder.rb b/ee/app/finders/feature_flags_finder.rb index 516ccd6d3d0c486c5deb0d0b3ec68dded2e2f229..9cb3bf7fa2388b1a8e598e38f273ef19ccd862d7 100644 --- a/ee/app/finders/feature_flags_finder.rb +++ b/ee/app/finders/feature_flags_finder.rb @@ -24,7 +24,7 @@ def execute(preload: true) private 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 else project.operations_feature_flags.legacy_flag diff --git a/ee/app/services/feature_flags/create_service.rb b/ee/app/services/feature_flags/create_service.rb index da338c31f3935f15d44edb25bf04b5727dc689d6..b4ca90f7aaea7f21b28dacfe1ef7a0a5ef4eb366 100644 --- a/ee/app/services/feature_flags/create_service.rb +++ b/ee/app/services/feature_flags/create_service.rb @@ -46,7 +46,7 @@ def flag_version_enabled? end 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 diff --git a/ee/changelogs/unreleased/rollout-new-version-ff.yml b/ee/changelogs/unreleased/rollout-new-version-ff.yml new file mode 100644 index 0000000000000000000000000000000000000000..a125d11fbdcf033e5223a42a22a796a6a0981a8a --- /dev/null +++ b/ee/changelogs/unreleased/rollout-new-version-ff.yml @@ -0,0 +1,5 @@ +--- +title: Enable new version feature flags by default +merge_request: 35192 +author: +type: added diff --git a/ee/lib/api/feature_flags.rb b/ee/lib/api/feature_flags.rb index 460527b9da51a0bd253d3ba351975dab3c505314..53be399e59b9280720b6a89f1d127798b2b8845f 100644 --- a/ee/lib/api/feature_flags.rb +++ b/ee/lib/api/feature_flags.rb @@ -246,7 +246,7 @@ def new_version_flag_present? end 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 def rename_key(hash, old_key, new_key)