diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-18 21:08:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-18 21:08:42 +0300 |
| commit | 9f2bc6fc4c27d0703260352c79463fbc62555ac8 (patch) | |
| tree | b65188898a054771df56298e4737837e999c8866 /config | |
| parent | b6b9abb7cdb61f18d6fc5222e52486d7f6c482dc (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/allow_dots_on_tf_state_names.yml | 8 | ||||
| -rw-r--r-- | config/feature_flags/development/batched_migrations_parallel_execution.yml | 2 | ||||
| -rw-r--r-- | config/feature_flags/development/namespace_limits_admin_dashboard.yml (renamed from config/feature_flags/development/plan_limits_admin_dashboard.yml) | 2 |
3 files changed, 2 insertions, 10 deletions
diff --git a/config/feature_flags/development/allow_dots_on_tf_state_names.yml b/config/feature_flags/development/allow_dots_on_tf_state_names.yml deleted file mode 100644 index 3bbff808eda..00000000000 --- a/config/feature_flags/development/allow_dots_on_tf_state_names.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: allow_dots_on_tf_state_names -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106861 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385597 -milestone: '15.7' -type: development -group: group::configure -default_enabled: false diff --git a/config/feature_flags/development/batched_migrations_parallel_execution.yml b/config/feature_flags/development/batched_migrations_parallel_execution.yml index 8cd030b8912..343225a68dc 100644 --- a/config/feature_flags/development/batched_migrations_parallel_execution.yml +++ b/config/feature_flags/development/batched_migrations_parallel_execution.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/384883 milestone: '15.7' type: development group: group::database -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/plan_limits_admin_dashboard.yml b/config/feature_flags/development/namespace_limits_admin_dashboard.yml index ea5f9cc2354..12706a8e3f9 100644 --- a/config/feature_flags/development/plan_limits_admin_dashboard.yml +++ b/config/feature_flags/development/namespace_limits_admin_dashboard.yml @@ -1,5 +1,5 @@ --- -name: plan_limits_admin_dashboard +name: namespace_limits_admin_dashboard introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115704 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/399220 milestone: '15.11' |