Add latest changes from gitlab-org/gitlab@master

5 files changed, 9 insertions, 49 deletions

diff --git a/config/feature_flags/development/gldropdown_tags.yml b/config/feature_flags/development/gldropdown_tags.yml
new file mode 100644
index 00000000000..704f276ac37
--- /dev/null
+++ b/config/feature_flags/development/gldropdown_tags.yml
@@ -0,0 +1,8 @@
+---
+name: gldropdown_tags
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58589
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/327055
+milestone: '13.11'
+type: development
+group: group::continuous integration
+default_enabled: false
diff --git a/config/feature_flags/development/issue_perform_after_creation_tasks_async.yml b/config/feature_flags/development/issue_perform_after_creation_tasks_async.yml
index 7184d742002..0efef586022 100644
--- a/config/feature_flags/development/issue_perform_after_creation_tasks_async.yml
+++ b/config/feature_flags/development/issue_perform_after_creation_tasks_async.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/21140
 milestone: '13.11'
 type: development
 group: group::geo
-default_enabled: false
+default_enabled: true
diff --git a/config/metrics/counts_all/20210216181205_confidential_epics.yml b/config/metrics/counts_all/20210216181205_confidential_epics.yml
deleted file mode 100644
index f2941af6bd2..00000000000
--- a/config/metrics/counts_all/20210216181205_confidential_epics.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: counts.confidential_epics
-description:
-product_section: dev
-product_stage: plan
-product_group: group::portfolio management
-product_category:
-value_type: number
-status: data_available
-time_frame: all
-data_source: database
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216181206_epics.yml b/config/metrics/counts_all/20210216181206_epics.yml
deleted file mode 100644
index 97452db6f85..00000000000
--- a/config/metrics/counts_all/20210216181206_epics.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: counts.epics
-description:
-product_section: dev
-product_stage: plan
-product_group: group::portfolio management
-product_category:
-value_type: number
-status: data_available
-time_frame: all
-data_source: database
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216181210_issues_with_health_status.yml b/config/metrics/counts_all/20210216181210_issues_with_health_status.yml
deleted file mode 100644
index 1df3a5d1a38..00000000000
--- a/config/metrics/counts_all/20210216181210_issues_with_health_status.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: counts.issues_with_health_status
-description:
-product_section: dev
-product_stage: plan
-product_group: group::portfolio management
-product_category:
-value_type: number
-status: data_available
-time_frame: all
-data_source: database
-distribution:
-- ce
-tier:
-- free
-skip_validation: true