Add latest changes from gitlab-org/gitlab@master

9 files changed, 117 insertions, 2 deletions

diff --git a/config/application.rb b/config/application.rb
index 83f5f83d120..f3dfa95ae1a 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -193,7 +193,6 @@ module Gitlab
     config.assets.precompile << "page_bundles/import.css"
     config.assets.precompile << "page_bundles/incident_management_list.css"
     config.assets.precompile << "page_bundles/issues_list.css"
-    config.assets.precompile << "page_bundles/iterations.css"
     config.assets.precompile << "page_bundles/jira_connect.css"
     config.assets.precompile << "page_bundles/jira_connect_users.css"
     config.assets.precompile << "page_bundles/learn_gitlab.css"
diff --git a/config/feature_flags/development/ci_reduce_queries_when_ticking_runner_queue.yml b/config/feature_flags/development/ci_reduce_queries_when_ticking_runner_queue.yml
index 906eb83aa01..92acb98969b 100644
--- a/config/feature_flags/development/ci_reduce_queries_when_ticking_runner_queue.yml
+++ b/config/feature_flags/development/ci_reduce_queries_when_ticking_runner_queue.yml
@@ -1,7 +1,7 @@
 ---
 name: ci_reduce_queries_when_ticking_runner_queue
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55496
-rollout_issue_url: 
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/323328
 milestone: '13.10'
 type: development
 group: group::continuous integration
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_time_estimate_changed.yml b/config/feature_flags/development/usage_data_i_code_review_user_time_estimate_changed.yml
new file mode 100644
index 00000000000..81096288a8d
--- /dev/null
+++ b/config/feature_flags/development/usage_data_i_code_review_user_time_estimate_changed.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_i_code_review_user_time_estimate_changed
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55046
+rollout_issue_url:
+milestone: '13.10'
+type: development
+group: group::code review
+default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_time_spent_changed.yml b/config/feature_flags/development/usage_data_i_code_review_user_time_spent_changed.yml
new file mode 100644
index 00000000000..56329f6b48b
--- /dev/null
+++ b/config/feature_flags/development/usage_data_i_code_review_user_time_spent_changed.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_i_code_review_user_time_spent_changed
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55046
+rollout_issue_url:
+milestone: '13.10'
+type: development
+group: group::code review
+default_enabled: true
diff --git a/config/metrics/counts_28d/20210301102134_i_code_review_user_time_estimate_changed_monthly.yml b/config/metrics/counts_28d/20210301102134_i_code_review_user_time_estimate_changed_monthly.yml
new file mode 100644
index 00000000000..69ad9237f0d
--- /dev/null
+++ b/config/metrics/counts_28d/20210301102134_i_code_review_user_time_estimate_changed_monthly.yml
@@ -0,0 +1,20 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_time_estimate_changed_monthly
+description: Count of unique users per month who changed time estimate of a MR
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: "13.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55046
+time_frame: 28d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210301102204_i_code_review_user_time_spent_changed_monthly.yml b/config/metrics/counts_28d/20210301102204_i_code_review_user_time_spent_changed_monthly.yml
new file mode 100644
index 00000000000..36972b7e168
--- /dev/null
+++ b/config/metrics/counts_28d/20210301102204_i_code_review_user_time_spent_changed_monthly.yml
@@ -0,0 +1,20 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_time_spent_changed_monthly
+description: Count of unique users per month who changed time spent on a MR
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: "13.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55046
+time_frame: 28d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210302103539_i_code_review_user_time_estimate_changed_weekly.yml b/config/metrics/counts_7d/20210302103539_i_code_review_user_time_estimate_changed_weekly.yml
new file mode 100644
index 00000000000..fb47deaba92
--- /dev/null
+++ b/config/metrics/counts_7d/20210302103539_i_code_review_user_time_estimate_changed_weekly.yml
@@ -0,0 +1,20 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_time_estimate_changed_weekly
+description: Count of unique users per week who changed time estimate of a MR
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: "13.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55046
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210302103615_i_code_review_user_time_spent_changed_weekly.yml b/config/metrics/counts_7d/20210302103615_i_code_review_user_time_spent_changed_weekly.yml
new file mode 100644
index 00000000000..91c88c00af8
--- /dev/null
+++ b/config/metrics/counts_7d/20210302103615_i_code_review_user_time_spent_changed_weekly.yml
@@ -0,0 +1,20 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_time_spent_changed_weekly
+description: Count of unique users per week who changed time spent on a MR
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: "13.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55046
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/settings/20210225045628_operating_system.yml b/config/metrics/settings/20210225045628_operating_system.yml
new file mode 100644
index 00000000000..e88b8f8c827
--- /dev/null
+++ b/config/metrics/settings/20210225045628_operating_system.yml
@@ -0,0 +1,20 @@
+---
+key_path: settings.operating_system
+description: Information about the operating system running GitLab
+product_section: enablement
+product_stage: enablement
+product_group: group::distribution
+product_category: collection
+value_type: string
+status: implemented
+milestone: "13.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54778
+time_frame: none
+data_source: ruby
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate