Add latest changes from gitlab-org/gitlab@master

12 files changed, 51 insertions, 32 deletions

diff --git a/config/feature_flags/development/ci_config_merged_tab.yml b/config/feature_flags/development/ci_config_merged_tab.yml
new file mode 100644
index 00000000000..5cee3429af8
--- /dev/null
+++ b/config/feature_flags/development/ci_config_merged_tab.yml
@@ -0,0 +1,8 @@
+---
+name: ci_config_merged_tab
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53299
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/301103
+milestone: '13.9'
+type: development
+group: group::pipeline authoring
+default_enabled: false
diff --git a/config/feature_flags/development/clear_status_with_quick_options.yml b/config/feature_flags/development/clear_status_with_quick_options.yml
new file mode 100644
index 00000000000..b4ce306fae0
--- /dev/null
+++ b/config/feature_flags/development/clear_status_with_quick_options.yml
@@ -0,0 +1,8 @@
+---
+name: clear_status_with_quick_options
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53620
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/320777
+milestone: '13.9'
+type: development
+group: group::optimize
+default_enabled: false
diff --git a/config/feature_flags/development/feature_flag_contextual_issue.yml b/config/feature_flags/development/coverage_data_new_finder.yml
index 1889a6c871c..a7c283ce3db 100644
--- a/config/feature_flags/development/feature_flag_contextual_issue.yml
+++ b/config/feature_flags/development/coverage_data_new_finder.yml
@@ -1,8 +1,8 @@
 ---
-name: feature_flag_contextual_issue
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53021
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/320741
+name: coverage_data_new_finder
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53670
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/301093
 milestone: '13.9'
 type: development
-group: group::release
+group: group::testing
 default_enabled: false
diff --git a/config/feature_flags/development/export_reduce_relation_batch_size.yml b/config/feature_flags/development/export_reduce_relation_batch_size.yml
index 70b19dfe594..63164b6e9fe 100644
--- a/config/feature_flags/development/export_reduce_relation_batch_size.yml
+++ b/config/feature_flags/development/export_reduce_relation_batch_size.yml
@@ -1,8 +1,8 @@
 ---
 name: export_reduce_relation_batch_size
-introduced_by_url: 
-rollout_issue_url: 
-milestone: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/34057
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/282245
+milestone: '13.1'
 type: development
 group: group::import
 default_enabled: false
diff --git a/config/feature_flags/development/gl_tooltips.yml b/config/feature_flags/development/gl_tooltips.yml
deleted file mode 100644
index 22c67019c33..00000000000
--- a/config/feature_flags/development/gl_tooltips.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: gl_tooltips
-introduced_by_url: 
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/292972
-milestone: '13.8'
-type: development
-group: group::editor
-default_enabled: false
diff --git a/config/feature_flags/development/group_import_export.yml b/config/feature_flags/development/group_import_export.yml
index 59204f2d16e..0eb01340bef 100644
--- a/config/feature_flags/development/group_import_export.yml
+++ b/config/feature_flags/development/group_import_export.yml
@@ -1,8 +1,8 @@
 ---
 name: group_import_export
-introduced_by_url: 
-rollout_issue_url: 
-milestone: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/22423
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/282245
+milestone: '12.8'
 type: development
 group: group::import
 default_enabled: true
diff --git a/config/feature_flags/development/log_import_export_relation_creation.yml b/config/feature_flags/development/log_import_export_relation_creation.yml
index ca7223c52b0..04d1b1e5d4f 100644
--- a/config/feature_flags/development/log_import_export_relation_creation.yml
+++ b/config/feature_flags/development/log_import_export_relation_creation.yml
@@ -1,8 +1,8 @@
 ---
 name: log_import_export_relation_creation
-introduced_by_url: 
-rollout_issue_url: 
-milestone: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27605
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/282245
+milestone: '12.10'
 type: development
 group: group::import
 default_enabled: false
diff --git a/config/feature_flags/development/project_list_filter_bar.yml b/config/feature_flags/development/project_list_filter_bar.yml
index 7f8ea867990..29d5d67af95 100644
--- a/config/feature_flags/development/project_list_filter_bar.yml
+++ b/config/feature_flags/development/project_list_filter_bar.yml
@@ -1,8 +1,8 @@
 ---
 name: project_list_filter_bar
-introduced_by_url: 
-rollout_issue_url: 
-milestone: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/11209
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321404
+milestone: '11.11'
 type: development
-group: 
+group: group::access
 default_enabled: false
diff --git a/config/feature_flags/development/user_time_settings.yml b/config/feature_flags/development/user_time_settings.yml
index eaeb7f17794..098b96e97f0 100644
--- a/config/feature_flags/development/user_time_settings.yml
+++ b/config/feature_flags/development/user_time_settings.yml
@@ -1,8 +1,8 @@
 ---
 name: user_time_settings
-introduced_by_url: 
-rollout_issue_url: 
-milestone: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/25381
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321407
+milestone: '11.11'
 type: development
-group: 
+group: group::access
 default_enabled: false
diff --git a/config/feature_flags/development/validate_import_decompressed_archive_size.yml b/config/feature_flags/development/validate_import_decompressed_archive_size.yml
index 644a936a67c..675586bc9ee 100644
--- a/config/feature_flags/development/validate_import_decompressed_archive_size.yml
+++ b/config/feature_flags/development/validate_import_decompressed_archive_size.yml
@@ -1,8 +1,8 @@
 ---
 name: validate_import_decompressed_archive_size
-introduced_by_url: 
-rollout_issue_url: 
-milestone: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39686
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/282245
+milestone: '13.4'
 type: development
 group: group::import
 default_enabled: false
diff --git a/config/feature_flags/development/vue_epics_list.yml b/config/feature_flags/development/vue_epics_list.yml
new file mode 100644
index 00000000000..22e2a53aeee
--- /dev/null
+++ b/config/feature_flags/development/vue_epics_list.yml
@@ -0,0 +1,8 @@
+---
+name: vue_epics_list
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46769
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/276189
+milestone: '13.9'
+type: development
+group: group::product planning
+default_enabled: false
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index b53c36cf029..557ad272d72 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -553,6 +553,9 @@ Settings.cron_jobs['schedule_merge_request_cleanup_refs_worker']['job_class'] =
 Settings.cron_jobs['manage_evidence_worker'] ||= Settingslogic.new({})
 Settings.cron_jobs['manage_evidence_worker']['cron'] ||= '0 * * * *'
 Settings.cron_jobs['manage_evidence_worker']['job_class'] = 'Releases::ManageEvidenceWorker'
+Settings.cron_jobs['user_status_cleanup_batch_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['user_status_cleanup_batch_worker']['cron'] ||= '* * * * *'
+Settings.cron_jobs['user_status_cleanup_batch_worker']['job_class'] = 'UserStatusCleanup::BatchWorker'
 
 Gitlab.com do
   Settings.cron_jobs['namespaces_in_product_marketing_emails_worker'] ||= Settingslogic.new({})