Add latest changes from gitlab-org/gitlab@master

6 files changed, 44 insertions, 27 deletions

diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml
index d76dd8fe25b..573286a4c11 100644
--- a/config/dependency_decisions.yml
+++ b/config/dependency_decisions.yml
@@ -124,13 +124,6 @@
     :versions: []
     :when: 2016-04-17 21:49:10.329759000 Z
 - - :license
-  - unicorn
-  - ruby
-  - :who: Connor Shea
-    :why: http://unicorn.bogomips.org/LICENSE.html
-    :versions: []
-    :when: 2016-05-02 05:45:28.817510000 Z
-- - :license
   - unf
   - BSD
   - :who: Connor Shea
diff --git a/config/feature_flags/development/database_sourced_aggregated_metrics.yml b/config/feature_flags/development/labels_widget.yml
index d971ad0b9d2..07045a13c30 100644
--- a/config/feature_flags/development/database_sourced_aggregated_metrics.yml
+++ b/config/feature_flags/development/labels_widget.yml
@@ -1,8 +1,8 @@
 ---
-name: database_sourced_aggregated_metrics
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52784
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/300411
-milestone: '13.9'
+name: labels_widget
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62898
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/332327
+milestone: '14.0'
 type: development
-group: group::product intelligence
+group: group::project management
 default_enabled: false
diff --git a/config/feature_flags/development/use_traversal_ids_for_root_ancestor.yml b/config/feature_flags/development/use_traversal_ids_for_root_ancestor.yml
new file mode 100644
index 00000000000..be02645720e
--- /dev/null
+++ b/config/feature_flags/development/use_traversal_ids_for_root_ancestor.yml
@@ -0,0 +1,8 @@
+---
+name: use_traversal_ids_for_root_ancestor
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61163
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/331907
+milestone: '14.0'
+type: development
+group: group::access
+default_enabled: false
diff --git a/config/feature_flags/ops/ci_trace_overwrite.yml b/config/feature_flags/ops/ci_trace_overwrite.yml
deleted file mode 100644
index 36caa9f6134..00000000000
--- a/config/feature_flags/ops/ci_trace_overwrite.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_trace_overwrite
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41304
-rollout_issue_url: 
-milestone: '13.4'
-type: ops
-group: group::continuous integration
-default_enabled: false
diff --git a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
index 541d619a6e7..1dcc98ad975 100644
--- a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
@@ -1,16 +1,20 @@
 ---
 key_path: redis_hll_counters.ci_templates.ci_templates_total_unique_counts_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Total count of pipelines runs
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
 value_type: number
-status: data_available
+status: broken
+repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/332466
 time_frame: 28d
 data_source: redis_hll
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+
diff --git a/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
new file mode 100644
index 00000000000..6f7c9c18aa1
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
@@ -0,0 +1,20 @@
+---
+key_path: redis_hll_counters.ci_templates.ci_templates_total_unique_counts_weekly
+description: Total count of pipelines runs
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
+value_type: number
+status: broken
+repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/332466
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+