From 7e9c479f7de77702622631cff2628a9c8dcbc627 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 19 Nov 2020 08:27:35 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-6-stable-ee --- config/feature_flags/ops/api_kaminari_count_with_limit.yml | 5 +++-- config/feature_flags/ops/ci_accept_trace.yml | 5 +++-- config/feature_flags/ops/ci_trace_log_invalid_chunks.yml | 3 ++- config/feature_flags/ops/ci_trace_overwrite.yml | 5 +++-- config/feature_flags/ops/database_reindexing.yml | 7 ++++--- config/feature_flags/ops/dynamic_image_resizing.yml | 8 ++++++++ .../ops/gitlab_sidekiq_enable_semi_reliable_fetcher.yml | 5 +++-- config/feature_flags/ops/gitlab_sidekiq_reliable_fetcher.yml | 3 ++- config/feature_flags/ops/kubernetes_agent_internal_api.yml | 5 +++-- config/feature_flags/ops/marginalia.yml | 3 ++- 10 files changed, 33 insertions(+), 16 deletions(-) create mode 100644 config/feature_flags/ops/dynamic_image_resizing.yml (limited to 'config/feature_flags/ops') diff --git a/config/feature_flags/ops/api_kaminari_count_with_limit.yml b/config/feature_flags/ops/api_kaminari_count_with_limit.yml index 1fdeaa53b83..a987d5c65b1 100644 --- a/config/feature_flags/ops/api_kaminari_count_with_limit.yml +++ b/config/feature_flags/ops/api_kaminari_count_with_limit.yml @@ -1,7 +1,8 @@ --- name: api_kaminari_count_with_limit introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/23931 -rollout_issue_url: -group: group::ecosystem +rollout_issue_url: +milestone: '11.8' type: ops +group: group::ecosystem default_enabled: false diff --git a/config/feature_flags/ops/ci_accept_trace.yml b/config/feature_flags/ops/ci_accept_trace.yml index 8671f42c3c1..2574e12f4f2 100644 --- a/config/feature_flags/ops/ci_accept_trace.yml +++ b/config/feature_flags/ops/ci_accept_trace.yml @@ -1,7 +1,8 @@ --- name: ci_accept_trace introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41304 -rollout_issue_url: -group: group::continuous integration +rollout_issue_url: +milestone: '13.4' type: ops +group: group::continuous integration default_enabled: true diff --git a/config/feature_flags/ops/ci_trace_log_invalid_chunks.yml b/config/feature_flags/ops/ci_trace_log_invalid_chunks.yml index f5e8bbae258..2deb3f42995 100644 --- a/config/feature_flags/ops/ci_trace_log_invalid_chunks.yml +++ b/config/feature_flags/ops/ci_trace_log_invalid_chunks.yml @@ -1,7 +1,8 @@ --- name: ci_trace_log_invalid_chunks introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44409 -rollout_issue_url: +rollout_issue_url: +milestone: '13.5' type: ops group: group::continuous integration default_enabled: false diff --git a/config/feature_flags/ops/ci_trace_overwrite.yml b/config/feature_flags/ops/ci_trace_overwrite.yml index 7996b957262..36caa9f6134 100644 --- a/config/feature_flags/ops/ci_trace_overwrite.yml +++ b/config/feature_flags/ops/ci_trace_overwrite.yml @@ -2,6 +2,7 @@ name: ci_trace_overwrite introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41304 rollout_issue_url: -group: group::continuous integration +milestone: '13.4' type: ops -default_enabled: false \ No newline at end of file +group: group::continuous integration +default_enabled: false diff --git a/config/feature_flags/ops/database_reindexing.yml b/config/feature_flags/ops/database_reindexing.yml index ea000a052db..fb0c29393f5 100644 --- a/config/feature_flags/ops/database_reindexing.yml +++ b/config/feature_flags/ops/database_reindexing.yml @@ -1,7 +1,8 @@ --- name: database_reindexing introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42705 -rollout_issue_url: -group: group::database +rollout_issue_url: +milestone: '13.5' type: ops -default_enabled: false \ No newline at end of file +group: group::database +default_enabled: false diff --git a/config/feature_flags/ops/dynamic_image_resizing.yml b/config/feature_flags/ops/dynamic_image_resizing.yml new file mode 100644 index 00000000000..f456fa8bf1e --- /dev/null +++ b/config/feature_flags/ops/dynamic_image_resizing.yml @@ -0,0 +1,8 @@ +--- +name: dynamic_image_resizing +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45050 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/266986 +milestone: '13.6' +type: ops +group: group::memory +default_enabled: true diff --git a/config/feature_flags/ops/gitlab_sidekiq_enable_semi_reliable_fetcher.yml b/config/feature_flags/ops/gitlab_sidekiq_enable_semi_reliable_fetcher.yml index 680f8201d27..4d6eedb840a 100644 --- a/config/feature_flags/ops/gitlab_sidekiq_enable_semi_reliable_fetcher.yml +++ b/config/feature_flags/ops/gitlab_sidekiq_enable_semi_reliable_fetcher.yml @@ -1,7 +1,8 @@ --- name: gitlab_sidekiq_enable_semi_reliable_fetcher -introduced_by_url: +introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/23854 rollout_issue_url: -group: +milestone: '11.6' type: ops +group: group::geo default_enabled: true diff --git a/config/feature_flags/ops/gitlab_sidekiq_reliable_fetcher.yml b/config/feature_flags/ops/gitlab_sidekiq_reliable_fetcher.yml index ae395e19384..d7db6a38775 100644 --- a/config/feature_flags/ops/gitlab_sidekiq_reliable_fetcher.yml +++ b/config/feature_flags/ops/gitlab_sidekiq_reliable_fetcher.yml @@ -2,6 +2,7 @@ name: gitlab_sidekiq_reliable_fetcher introduced_by_url: rollout_issue_url: -group: +milestone: type: ops +group: default_enabled: true diff --git a/config/feature_flags/ops/kubernetes_agent_internal_api.yml b/config/feature_flags/ops/kubernetes_agent_internal_api.yml index f1dfdbb3950..34731aaeb52 100644 --- a/config/feature_flags/ops/kubernetes_agent_internal_api.yml +++ b/config/feature_flags/ops/kubernetes_agent_internal_api.yml @@ -1,7 +1,8 @@ --- name: kubernetes_agent_internal_api introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41045 -rollout_issue_url: -group: group::configure +rollout_issue_url: +milestone: '13.4' type: ops +group: group::configure default_enabled: true diff --git a/config/feature_flags/ops/marginalia.yml b/config/feature_flags/ops/marginalia.yml index a5d64c48b27..fb82f274eb2 100644 --- a/config/feature_flags/ops/marginalia.yml +++ b/config/feature_flags/ops/marginalia.yml @@ -2,6 +2,7 @@ name: marginalia introduced_by_url: rollout_issue_url: -group: +milestone: type: ops +group: default_enabled: false -- cgit v1.2.3