summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2021-01-20 13:34:23 -0600
committerRobert Speicher <rspeicher@gmail.com>2021-01-20 13:34:23 -0600
commit6438df3a1e0fb944485cebf07976160184697d72 (patch)
tree00b09bfd170e77ae9391b1a2f5a93ef6839f2597 /config
parent42bcd54d971da7ef2854b896a7b34f4ef8601067 (diff)
downloadgitlab-ce-6438df3a1e0fb944485cebf07976160184697d72.tar.gz
Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42
Diffstat (limited to 'config')
-rw-r--r--config/application.rb13
-rw-r--r--config/feature_categories.yml4
-rw-r--r--config/feature_flags/development/ci_allow_failure_with_exit_codes.yml2
-rw-r--r--config/feature_flags/development/ci_config_visualization_tab.yml2
-rw-r--r--config/feature_flags/development/ci_include_multiple_files_from_project.yml8
-rw-r--r--config/feature_flags/development/ci_pipeline_editor_page.yml2
-rw-r--r--config/feature_flags/development/ci_pipeline_open_merge_requests.yml3
-rw-r--r--config/feature_flags/development/ci_rules_variables.yml2
-rw-r--r--config/feature_flags/development/ci_seed_block_run_before_workflow_rules.yml8
-rw-r--r--config/feature_flags/development/collect_package_events_redis.yml2
-rw-r--r--config/feature_flags/development/devops_adoption_feature.yml4
-rw-r--r--config/feature_flags/development/drag_comment_selection.yml (renamed from config/feature_flags/development/vue_2fa_recovery_codes.yml)8
-rw-r--r--config/feature_flags/development/gitpod.yml8
-rw-r--r--config/feature_flags/development/gl_tooltips.yml8
-rw-r--r--config/feature_flags/development/graphql_logging.yml4
-rw-r--r--config/feature_flags/development/group_members_filtered_search.yml8
-rw-r--r--config/feature_flags/development/invisible_captcha.yml8
-rw-r--r--config/feature_flags/development/jira_sync_deployments.yml (renamed from config/feature_flags/development/reset_integrations.yml)6
-rw-r--r--config/feature_flags/development/jira_sync_feature_flags.yml8
-rw-r--r--config/feature_flags/development/lfs_chunked_encoding.yml8
-rw-r--r--config/feature_flags/development/merge_ref_auto_sync.yml8
-rw-r--r--config/feature_flags/development/merge_ref_auto_sync_lock.yml8
-rw-r--r--config/feature_flags/development/multiple_todos.yml (renamed from config/feature_flags/development/show_inherited_labels.yml)10
-rw-r--r--config/feature_flags/development/new_jira_connect_ui.yml (renamed from config/feature_flags/development/test_failure_history.yml)10
-rw-r--r--config/feature_flags/development/new_project_level_vsa_backend.yml8
-rw-r--r--config/feature_flags/development/non_public_artifacts.yml (renamed from config/feature_flags/development/pat_creation_api_for_admin.yml)9
-rw-r--r--config/feature_flags/development/optional_code_owners_sections.yml8
-rw-r--r--config/feature_flags/development/packages_and_registries_group_settings.yml8
-rw-r--r--config/feature_flags/development/pages_migration_mark_as_not_deployed.yml (renamed from config/feature_flags/development/cd_skipped_deployment_status.yml)9
-rw-r--r--config/feature_flags/development/reviewer_approval_rules.yml2
-rw-r--r--config/feature_flags/development/s3_multithreaded_uploads.yml (renamed from config/feature_flags/development/restrict_access_to_build_debug_mode.yml)8
-rw-r--r--config/feature_flags/development/search_settings_in_page.yml (renamed from config/feature_flags/development/graphql_pipeline_analytics.yml)8
-rw-r--r--config/feature_flags/development/security_on_demand_scans_site_validation.yml2
-rw-r--r--config/feature_flags/development/service_desk_custom_address.yml8
-rw-r--r--config/feature_flags/development/set_user_availability_status.yml2
-rw-r--r--config/feature_flags/development/skip_dag_manual_and_delayed_jobs.yml (renamed from config/feature_flags/development/ci_bridge_dependency_variables.yml)9
-rw-r--r--config/feature_flags/development/sourcegraph.yml (renamed from config/feature_flags/development/startup_css.yml)8
-rw-r--r--config/feature_flags/development/suggestions_custom_commit.yml8
-rw-r--r--config/feature_flags/development/track_unique_wiki_page_views.yml2
-rw-r--r--config/feature_flags/development/unified_diff_components.yml2
-rw-r--r--config/feature_flags/development/upload_middleware_jwt_params_handler.yml8
-rw-r--r--config/feature_flags/development/usage_data_i_code_review_mr_diffs.yml (renamed from config/feature_flags/development/diff_check_with_paths_changed_rpc.yml)6
-rw-r--r--config/feature_flags/development/usage_data_i_code_review_mr_single_file_diffs.yml8
-rw-r--r--config/feature_flags/development/usage_data_i_code_review_user_close_mr.yml (renamed from config/feature_flags/development/mr_commit_neighbor_nav.yml)6
-rw-r--r--config/feature_flags/development/usage_data_i_code_review_user_create_mr.yml (renamed from config/feature_flags/development/hide_jump_to_next_unresolved_in_threads.yml)6
-rw-r--r--config/feature_flags/development/usage_data_i_code_review_user_create_mr_comment.yml8
-rw-r--r--config/feature_flags/development/usage_data_i_code_review_user_create_multiline_mr_comment.yml8
-rw-r--r--config/feature_flags/development/usage_data_i_code_review_user_create_review_note.yml8
-rw-r--r--config/feature_flags/development/usage_data_i_code_review_user_edit_mr_comment.yml8
-rw-r--r--config/feature_flags/development/usage_data_i_code_review_user_edit_multiline_mr_comment.yml8
-rw-r--r--config/feature_flags/development/usage_data_i_code_review_user_merge_mr.yml (renamed from config/feature_flags/development/widget_visibility_polling.yml)6
-rw-r--r--config/feature_flags/development/usage_data_i_code_review_user_publish_review.yml8
-rw-r--r--config/feature_flags/development/usage_data_i_code_review_user_remove_mr_comment.yml8
-rw-r--r--config/feature_flags/development/usage_data_i_code_review_user_remove_multiline_mr_comment.yml8
-rw-r--r--config/feature_flags/development/usage_data_i_code_review_user_reopen_mr.yml (renamed from config/feature_flags/development/merge_orchestration_service.yml)8
-rw-r--r--config/feature_flags/development/usage_data_i_code_review_user_single_file_diffs.yml8
-rw-r--r--config/feature_flags/development/usage_data_i_testing_full_code_quality_report_total.yml8
-rw-r--r--config/feature_flags/development/usage_data_i_testing_group_code_coverage_visit_total.yml8
-rw-r--r--config/feature_flags/development/usage_data_i_testing_metrics_report_widget_total.yml8
-rw-r--r--config/feature_flags/development/usage_data_i_testing_web_performance_widget_total.yml8
-rw-r--r--config/feature_flags/development/usage_data_incident_management_alerts_total_unique_counts.yml8
-rw-r--r--config/feature_flags/development/usage_data_incident_management_incidents_total_unique_counts.yml8
-rw-r--r--config/feature_flags/development/usage_data_p_terraform_state_api_unique_users.yml8
-rw-r--r--config/feature_flags/development/usage_data_track_ci_templates_unique_projects.yml (renamed from config/feature_flags/development/coverage_fuzzing_mr_widget.yml)10
-rw-r--r--config/feature_flags/development/value_stream_analytics_extended_form.yml (renamed from config/feature_flags/development/ci_pipelines_for_merge_request_finder_new_cte.yml)8
-rw-r--r--config/feature_flags/development/variable_inside_variable.yml8
-rw-r--r--config/feature_flags/development/variables_in_include_section_ci.yml8
-rw-r--r--config/feature_flags/development/vue_group_members_list.yml8
-rw-r--r--config/feature_flags/development/wiki.yml2
-rw-r--r--config/feature_flags/development/wiki_front_matter.yml6
-rw-r--r--config/feature_flags/experiment/ci_syntax_templates_experiment_percentage.yml8
-rw-r--r--config/feature_flags/experiment/customize_homepage_experiment_percentage.yml8
-rw-r--r--config/feature_flags/experiment/default_to_issues_board_experiment_percentage.yml (renamed from config/feature_flags/development/feature_flags_legacy_read_only.yml)12
-rw-r--r--config/feature_flags/experiment/invite_members_empty_group_version_a_experiment_percentage.yml8
-rw-r--r--config/feature_flags/experiment/invite_members_empty_project_version_a_experiment_percentage.yml (renamed from config/feature_flags/development/feature_flags_legacy_read_only_override.yml)12
-rw-r--r--config/feature_flags/experiment/invite_members_new_dropdown_experiment_percentage.yml8
-rw-r--r--config/feature_flags/experiment/invite_members_version_a_experiment_percentage.yml8
-rw-r--r--config/feature_flags/experiment/invite_members_version_b_experiment_percentage.yml8
-rw-r--r--config/feature_flags/experiment/jobs_empty_state_experiment_percentage.yml8
-rw-r--r--config/feature_flags/experiment/null_hypothesis.yml1
-rw-r--r--config/feature_flags/experiment/onboarding_issues_experiment_percentage.yml (renamed from config/feature_flags/development/github_import_pull_request_reviews.yml)12
-rw-r--r--config/feature_flags/experiment/pipelines_empty_state_experiment_percentage.yml8
-rw-r--r--config/feature_flags/ops/explore_pipeline_status.yml (renamed from config/feature_flags/development/jira_connect_full_namespace_sync.yml)9
-rw-r--r--config/feature_flags/ops/scalability_ci_fetch_sha.yml8
-rw-r--r--config/gitlab.yml.example14
-rw-r--r--config/helpers/is_eslint.js2
-rw-r--r--config/helpers/vendor_dll_hash.js10
-rw-r--r--config/initializers/0_inject_feature_flags.rb39
-rw-r--r--config/initializers/1_settings.rb17
-rw-r--r--config/initializers/8_devise.rb2
-rw-r--r--config/initializers/carrierwave_patch.rb19
-rw-r--r--config/initializers/grape_patch.rb31
-rw-r--r--config/initializers/postgres_partitioning.rb2
-rw-r--r--config/initializers/trusted_proxies.rb2
-rw-r--r--config/karma.config.js12
-rw-r--r--config/known_invalid_graphql_queries.yml5
-rw-r--r--config/locales/en.yml1
-rw-r--r--config/metrics/counts_28d/deployments.yml15
-rw-r--r--config/metrics/counts_7d/g_project_management_issue_title_changed_weekly.yml16
-rw-r--r--config/metrics/counts_all/deployments.yml15
-rw-r--r--config/metrics/license/recorded_at.yml16
-rw-r--r--config/metrics/license/uuid.yml17
-rw-r--r--config/metrics/schema.json66
-rw-r--r--config/metrics/settings/database_adapter.yml14
-rw-r--r--config/plugins/monaco_webpack.js2
-rw-r--r--config/puma.example.development.rb10
-rw-r--r--config/puma.rb.example12
-rw-r--r--config/puma_actioncable.example.development.rb10
-rw-r--r--config/routes.rb15
-rw-r--r--config/routes/group.rb2
-rw-r--r--config/routes/import.rb1
-rw-r--r--config/sidekiq_queues.yml10
-rw-r--r--config/webpack.config.js18
113 files changed, 655 insertions, 337 deletions
diff --git a/config/application.rb b/config/application.rb
index 178a5c1d3dd..a8b6bc937cf 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -177,6 +177,7 @@ module Gitlab
config.assets.precompile << "mailers/*.css"
config.assets.precompile << "page_bundles/_mixins_and_variables_and_functions.css"
config.assets.precompile << "page_bundles/alert_management_details.css"
+ config.assets.precompile << "page_bundles/alert_management_settings.css"
config.assets.precompile << "page_bundles/boards.css"
config.assets.precompile << "page_bundles/build.css"
config.assets.precompile << "page_bundles/ci_status.css"
@@ -186,29 +187,29 @@ module Gitlab
config.assets.precompile << "page_bundles/epics.css"
config.assets.precompile << "page_bundles/error_tracking_details.css"
config.assets.precompile << "page_bundles/error_tracking_index.css"
- config.assets.precompile << "page_bundles/signup.css"
config.assets.precompile << "page_bundles/ide.css"
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/jira_connect.css"
config.assets.precompile << "page_bundles/jira_connect_users.css"
config.assets.precompile << "page_bundles/merge_conflicts.css"
config.assets.precompile << "page_bundles/merge_requests.css"
config.assets.precompile << "page_bundles/milestone.css"
+ config.assets.precompile << "page_bundles/oncall_schedules.css"
config.assets.precompile << "page_bundles/pipeline.css"
- config.assets.precompile << "page_bundles/pipelines.css"
config.assets.precompile << "page_bundles/pipeline_schedules.css"
+ config.assets.precompile << "page_bundles/pipelines.css"
config.assets.precompile << "page_bundles/productivity_analytics.css"
config.assets.precompile << "page_bundles/profile_two_factor_auth.css"
+ config.assets.precompile << "page_bundles/reports.css"
+ config.assets.precompile << "page_bundles/roadmap.css"
config.assets.precompile << "page_bundles/security_dashboard.css"
+ config.assets.precompile << "page_bundles/signup.css"
config.assets.precompile << "page_bundles/terminal.css"
config.assets.precompile << "page_bundles/todos.css"
- config.assets.precompile << "page_bundles/reports.css"
- config.assets.precompile << "page_bundles/roadmap.css"
config.assets.precompile << "page_bundles/wiki.css"
config.assets.precompile << "page_bundles/xterm.css"
- config.assets.precompile << "page_bundles/alert_management_settings.css"
- config.assets.precompile << "page_bundles/oncall_schedules.css"
config.assets.precompile << "lazy_bundles/cropper.css"
config.assets.precompile << "lazy_bundles/select2.css"
config.assets.precompile << "performance_bar.css"
diff --git a/config/feature_categories.yml b/config/feature_categories.yml
index 2b6f8fc51db..805cc3b50a3 100644
--- a/config/feature_categories.yml
+++ b/config/feature_categories.yml
@@ -9,7 +9,6 @@
---
- accessibility_testing
- advanced_deployments
-- analysis
- api
- attack_emulation
- audit_events
@@ -25,7 +24,6 @@
- code_quality
- code_review
- code_testing
-- collection
- compliance_management
- container_host_security
- container_network_security
@@ -83,6 +81,7 @@
- pages
- pipeline_authoring
- planning_analytics
+- privacy_control_center
- product_analytics
- projects
- provision
@@ -112,6 +111,7 @@
- time_tracking
- tracing
- usability_testing
+- usage_ping
- users
- value_stream_management
- vulnerability_database
diff --git a/config/feature_flags/development/ci_allow_failure_with_exit_codes.yml b/config/feature_flags/development/ci_allow_failure_with_exit_codes.yml
index c2701705616..1d33a162445 100644
--- a/config/feature_flags/development/ci_allow_failure_with_exit_codes.yml
+++ b/config/feature_flags/development/ci_allow_failure_with_exit_codes.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/292024
milestone: '13.7'
type: development
group: group::pipeline authoring
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/ci_config_visualization_tab.yml b/config/feature_flags/development/ci_config_visualization_tab.yml
index 70e395d83e9..cdc7322b7fd 100644
--- a/config/feature_flags/development/ci_config_visualization_tab.yml
+++ b/config/feature_flags/development/ci_config_visualization_tab.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/290117
milestone: '13.7'
type: development
group: group::pipeline authoring
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/ci_include_multiple_files_from_project.yml b/config/feature_flags/development/ci_include_multiple_files_from_project.yml
deleted file mode 100644
index a291287bd4f..00000000000
--- a/config/feature_flags/development/ci_include_multiple_files_from_project.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_include_multiple_files_from_project
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45991
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/271560
-milestone: '13.6'
-type: development
-group: group::pipeline authoring
-default_enabled: true
diff --git a/config/feature_flags/development/ci_pipeline_editor_page.yml b/config/feature_flags/development/ci_pipeline_editor_page.yml
index 9870f419842..313126f3444 100644
--- a/config/feature_flags/development/ci_pipeline_editor_page.yml
+++ b/config/feature_flags/development/ci_pipeline_editor_page.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/270059
milestone: '13.6'
type: development
group: group::pipeline authoring
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/ci_pipeline_open_merge_requests.yml b/config/feature_flags/development/ci_pipeline_open_merge_requests.yml
index e3be9e7323d..7e2ae1edd34 100644
--- a/config/feature_flags/development/ci_pipeline_open_merge_requests.yml
+++ b/config/feature_flags/development/ci_pipeline_open_merge_requests.yml
@@ -2,6 +2,7 @@
name: ci_pipeline_open_merge_requests
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38673
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/292727
+milestone: '13.7'
group: group::memory
type: development
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/ci_rules_variables.yml b/config/feature_flags/development/ci_rules_variables.yml
index fdd9de19472..8ea2e21af14 100644
--- a/config/feature_flags/development/ci_rules_variables.yml
+++ b/config/feature_flags/development/ci_rules_variables.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/289803
milestone: '13.7'
type: development
group: group::pipeline authoring
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/ci_seed_block_run_before_workflow_rules.yml b/config/feature_flags/development/ci_seed_block_run_before_workflow_rules.yml
deleted file mode 100644
index 6e030c3685a..00000000000
--- a/config/feature_flags/development/ci_seed_block_run_before_workflow_rules.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_seed_block_run_before_workflow_rules
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45674
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/270439
-milestone: '13.6'
-type: development
-group: group::pipeline authoring
-default_enabled: true
diff --git a/config/feature_flags/development/collect_package_events_redis.yml b/config/feature_flags/development/collect_package_events_redis.yml
index bc440a44f84..54dcf7c1bc6 100644
--- a/config/feature_flags/development/collect_package_events_redis.yml
+++ b/config/feature_flags/development/collect_package_events_redis.yml
@@ -4,4 +4,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46846
rollout_issue_url:
group: group::package
type: development
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/devops_adoption_feature.yml b/config/feature_flags/development/devops_adoption_feature.yml
index 34ade24cbc6..0b643b4e60e 100644
--- a/config/feature_flags/development/devops_adoption_feature.yml
+++ b/config/feature_flags/development/devops_adoption_feature.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46005
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/271568
milestone: '13.6'
type: development
-group: group::analytics
-default_enabled: true
+group: group::optimize
+default_enabled: false
diff --git a/config/feature_flags/development/vue_2fa_recovery_codes.yml b/config/feature_flags/development/drag_comment_selection.yml
index 7995b00f9ab..a34d2a6231b 100644
--- a/config/feature_flags/development/vue_2fa_recovery_codes.yml
+++ b/config/feature_flags/development/drag_comment_selection.yml
@@ -1,8 +1,8 @@
---
-name: vue_2fa_recovery_codes
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49078
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/290113
+name: drag_comment_selection
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49875
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/293945
milestone: '13.7'
type: development
-group: group::access
+group: group::source code
default_enabled: true
diff --git a/config/feature_flags/development/gitpod.yml b/config/feature_flags/development/gitpod.yml
deleted file mode 100644
index 616aae4be45..00000000000
--- a/config/feature_flags/development/gitpod.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: gitpod
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37985
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/258206
-milestone: '13.4'
-type: development
-group: group::editor
-default_enabled: true
diff --git a/config/feature_flags/development/gl_tooltips.yml b/config/feature_flags/development/gl_tooltips.yml
new file mode 100644
index 00000000000..22c67019c33
--- /dev/null
+++ b/config/feature_flags/development/gl_tooltips.yml
@@ -0,0 +1,8 @@
+---
+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/graphql_logging.yml b/config/feature_flags/development/graphql_logging.yml
index 30f03a60a06..c3615215048 100644
--- a/config/feature_flags/development/graphql_logging.yml
+++ b/config/feature_flags/development/graphql_logging.yml
@@ -1,8 +1,8 @@
---
name: graphql_logging
introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/27885
-rollout_issue_url:
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/35579
milestone: '12.0'
type: development
-group:
+group: group::project management
default_enabled: true
diff --git a/config/feature_flags/development/group_members_filtered_search.yml b/config/feature_flags/development/group_members_filtered_search.yml
deleted file mode 100644
index 8a30bdd3d92..00000000000
--- a/config/feature_flags/development/group_members_filtered_search.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: group_members_filtered_search
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48272
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/289911
-milestone: '13.7'
-type: development
-group: group::access
-default_enabled: true
diff --git a/config/feature_flags/development/invisible_captcha.yml b/config/feature_flags/development/invisible_captcha.yml
deleted file mode 100644
index bfe118c1826..00000000000
--- a/config/feature_flags/development/invisible_captcha.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: invisible_captcha
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/31625
-rollout_issue_url:
-milestone: '12.2'
-type: development
-group: group::acquisition
-default_enabled: false
diff --git a/config/feature_flags/development/reset_integrations.yml b/config/feature_flags/development/jira_sync_deployments.yml
index 332fbc96ef5..8a644d43ba0 100644
--- a/config/feature_flags/development/reset_integrations.yml
+++ b/config/feature_flags/development/jira_sync_deployments.yml
@@ -1,7 +1,7 @@
---
-name: reset_integrations
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47546
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/283875
+name: jira_sync_deployments
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49757
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/294034
milestone: '13.7'
type: development
group: group::ecosystem
diff --git a/config/feature_flags/development/jira_sync_feature_flags.yml b/config/feature_flags/development/jira_sync_feature_flags.yml
new file mode 100644
index 00000000000..c5925766919
--- /dev/null
+++ b/config/feature_flags/development/jira_sync_feature_flags.yml
@@ -0,0 +1,8 @@
+---
+name: jira_sync_feature_flags
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50390
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/296990
+milestone: '13.8'
+type: development
+group: group::ecosystem
+default_enabled: false
diff --git a/config/feature_flags/development/lfs_chunked_encoding.yml b/config/feature_flags/development/lfs_chunked_encoding.yml
deleted file mode 100644
index 92f534d1000..00000000000
--- a/config/feature_flags/development/lfs_chunked_encoding.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: lfs_chunked_encoding
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48269
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/285581
-milestone: '13.6'
-type: development
-group:
-default_enabled: true
diff --git a/config/feature_flags/development/merge_ref_auto_sync.yml b/config/feature_flags/development/merge_ref_auto_sync.yml
deleted file mode 100644
index 9fd1eecbe5a..00000000000
--- a/config/feature_flags/development/merge_ref_auto_sync.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: merge_ref_auto_sync
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/29569
-rollout_issue_url:
-milestone: '12.1'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/merge_ref_auto_sync_lock.yml b/config/feature_flags/development/merge_ref_auto_sync_lock.yml
deleted file mode 100644
index 3aec2b4e062..00000000000
--- a/config/feature_flags/development/merge_ref_auto_sync_lock.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: merge_ref_auto_sync_lock
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/31082
-rollout_issue_url:
-milestone: '12.2'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/show_inherited_labels.yml b/config/feature_flags/development/multiple_todos.yml
index 1ee1daaf0af..6ac797b7e5e 100644
--- a/config/feature_flags/development/show_inherited_labels.yml
+++ b/config/feature_flags/development/multiple_todos.yml
@@ -1,8 +1,8 @@
---
-name: show_inherited_labels
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42960
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/267547
-milestone: '13.5'
+name: multiple_todos
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47629
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/28355
+milestone: '13.8'
type: development
group: group::project management
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/test_failure_history.yml b/config/feature_flags/development/new_jira_connect_ui.yml
index 4a0424aae9e..8783c1ed7fd 100644
--- a/config/feature_flags/development/test_failure_history.yml
+++ b/config/feature_flags/development/new_jira_connect_ui.yml
@@ -1,8 +1,8 @@
---
-name: test_failure_history
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45027
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/268249
-milestone: '13.6'
+name: new_jira_connect_ui
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50692
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/295647
+milestone: '13.8'
type: development
-group: group::testing
+group: group::ecosystem
default_enabled: false
diff --git a/config/feature_flags/development/new_project_level_vsa_backend.yml b/config/feature_flags/development/new_project_level_vsa_backend.yml
deleted file mode 100644
index 988e5e39a03..00000000000
--- a/config/feature_flags/development/new_project_level_vsa_backend.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: new_project_level_vsa_backend
-introduced_by_url:
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/282435
-milestone: '13.7'
-type: development
-group: group::optimize
-default_enabled: true
diff --git a/config/feature_flags/development/pat_creation_api_for_admin.yml b/config/feature_flags/development/non_public_artifacts.yml
index 246f7623cc9..e2a2fd49df7 100644
--- a/config/feature_flags/development/pat_creation_api_for_admin.yml
+++ b/config/feature_flags/development/non_public_artifacts.yml
@@ -1,7 +1,8 @@
---
-name: pat_creation_api_for_admin
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45152
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/267553
+name: non_public_artifacts
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49775
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/294503
+milestone: '13.8'
type: development
-group: group::access
+group: group::configure
default_enabled: false
diff --git a/config/feature_flags/development/optional_code_owners_sections.yml b/config/feature_flags/development/optional_code_owners_sections.yml
new file mode 100644
index 00000000000..a7933f42fc9
--- /dev/null
+++ b/config/feature_flags/development/optional_code_owners_sections.yml
@@ -0,0 +1,8 @@
+---
+name: optional_code_owners_sections
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51002
+rollout_issue_url:
+milestone: '13.8'
+type: development
+group: group::source code
+default_enabled: true
diff --git a/config/feature_flags/development/packages_and_registries_group_settings.yml b/config/feature_flags/development/packages_and_registries_group_settings.yml
new file mode 100644
index 00000000000..8712fa4895d
--- /dev/null
+++ b/config/feature_flags/development/packages_and_registries_group_settings.yml
@@ -0,0 +1,8 @@
+---
+name: packages_and_registries_group_settings
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51460
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/297371
+milestone: '13.8'
+type: development
+group: group::package
+default_enabled: false
diff --git a/config/feature_flags/development/cd_skipped_deployment_status.yml b/config/feature_flags/development/pages_migration_mark_as_not_deployed.yml
index 45d9538ebfc..f8b28785a2d 100644
--- a/config/feature_flags/development/cd_skipped_deployment_status.yml
+++ b/config/feature_flags/development/pages_migration_mark_as_not_deployed.yml
@@ -1,7 +1,8 @@
-name: cd_skipped_deployment_status
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46614
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/283884
-milestone: '13.6'
+---
+name: pages_migration_mark_as_not_deployed
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49473
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/295187
+milestone: '13.8'
type: development
group: group::release
default_enabled: false
diff --git a/config/feature_flags/development/reviewer_approval_rules.yml b/config/feature_flags/development/reviewer_approval_rules.yml
index 97181ef2a36..78bc52de5b3 100644
--- a/config/feature_flags/development/reviewer_approval_rules.yml
+++ b/config/feature_flags/development/reviewer_approval_rules.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/293742
milestone: '13.7'
type: development
group: group::code review
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/restrict_access_to_build_debug_mode.yml b/config/feature_flags/development/s3_multithreaded_uploads.yml
index 6d195e03842..cab1925488a 100644
--- a/config/feature_flags/development/restrict_access_to_build_debug_mode.yml
+++ b/config/feature_flags/development/s3_multithreaded_uploads.yml
@@ -1,8 +1,8 @@
---
-name: restrict_access_to_build_debug_mode
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48932
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/292661
-milestone: '13.7'
+name: s3_multithreaded_uploads
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50922
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/296772
+milestone: '13.8'
type: development
group: group::continuous integration
default_enabled: true
diff --git a/config/feature_flags/development/graphql_pipeline_analytics.yml b/config/feature_flags/development/search_settings_in_page.yml
index f91475fcbd7..26db77ebdb7 100644
--- a/config/feature_flags/development/graphql_pipeline_analytics.yml
+++ b/config/feature_flags/development/search_settings_in_page.yml
@@ -1,8 +1,8 @@
---
-name: graphql_pipeline_analytics
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48267
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/290153
+name: search_settings_in_page
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50207
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/294025
milestone: '13.7'
type: development
-group: group::continuos integration
+group: group::editor
default_enabled: false
diff --git a/config/feature_flags/development/security_on_demand_scans_site_validation.yml b/config/feature_flags/development/security_on_demand_scans_site_validation.yml
index 9085c22b773..bfe02a0bad7 100644
--- a/config/feature_flags/development/security_on_demand_scans_site_validation.yml
+++ b/config/feature_flags/development/security_on_demand_scans_site_validation.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/241815
milestone: '13.4'
type: development
group: group::dynamic analysis
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/service_desk_custom_address.yml b/config/feature_flags/development/service_desk_custom_address.yml
deleted file mode 100644
index e7db2f10e2f..00000000000
--- a/config/feature_flags/development/service_desk_custom_address.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: service_desk_custom_address
-introduced_by_url:
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/284656
-milestone:
-type: development
-group: group::certify
-default_enabled: true
diff --git a/config/feature_flags/development/set_user_availability_status.yml b/config/feature_flags/development/set_user_availability_status.yml
index be3ff522ccc..dd48ddef6d5 100644
--- a/config/feature_flags/development/set_user_availability_status.yml
+++ b/config/feature_flags/development/set_user_availability_status.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/281073
milestone: '13.6'
type: development
group: group::optimize
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/ci_bridge_dependency_variables.yml b/config/feature_flags/development/skip_dag_manual_and_delayed_jobs.yml
index 54670f93601..678a52ee613 100644
--- a/config/feature_flags/development/ci_bridge_dependency_variables.yml
+++ b/config/feature_flags/development/skip_dag_manual_and_delayed_jobs.yml
@@ -1,7 +1,8 @@
---
-name: ci_bridge_dependency_variables
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46530
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/273734
+name: skip_dag_manual_and_delayed_jobs
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50765
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/297240
+milestone: '13.8'
type: development
group: group::pipeline authoring
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/startup_css.yml b/config/feature_flags/development/sourcegraph.yml
index 88a1cd77c95..12170aec869 100644
--- a/config/feature_flags/development/startup_css.yml
+++ b/config/feature_flags/development/sourcegraph.yml
@@ -1,8 +1,8 @@
---
-name: startup_css
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39713
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/238718
-milestone: '13.3'
+name: sourcegraph
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/16556
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/292199
+milestone: '12.5'
type: development
group: group::editor
default_enabled: false
diff --git a/config/feature_flags/development/suggestions_custom_commit.yml b/config/feature_flags/development/suggestions_custom_commit.yml
new file mode 100644
index 00000000000..e51e219ee1d
--- /dev/null
+++ b/config/feature_flags/development/suggestions_custom_commit.yml
@@ -0,0 +1,8 @@
+---
+name: suggestions_custom_commit
+introduced_by_url:
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/297404
+milestone: '13.9'
+type: development
+group: group::code review
+default_enabled: false
diff --git a/config/feature_flags/development/track_unique_wiki_page_views.yml b/config/feature_flags/development/track_unique_wiki_page_views.yml
index eb2bf1304d9..39d25352e73 100644
--- a/config/feature_flags/development/track_unique_wiki_page_views.yml
+++ b/config/feature_flags/development/track_unique_wiki_page_views.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44622
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/267162
milestone: '13.5'
type: development
-group: group::knowledge
+group: group::editor
default_enabled: true
diff --git a/config/feature_flags/development/unified_diff_components.yml b/config/feature_flags/development/unified_diff_components.yml
index 68a1cd8996f..0176d8c55ba 100644
--- a/config/feature_flags/development/unified_diff_components.yml
+++ b/config/feature_flags/development/unified_diff_components.yml
@@ -4,4 +4,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44974
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/268039
type: development
group: group::code review
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/upload_middleware_jwt_params_handler.yml b/config/feature_flags/development/upload_middleware_jwt_params_handler.yml
deleted file mode 100644
index 60a68005235..00000000000
--- a/config/feature_flags/development/upload_middleware_jwt_params_handler.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: upload_middleware_jwt_params_handler
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/33277
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/233895
-milestone: '13.4'
-type: development
-group: group::package
-default_enabled: true
diff --git a/config/feature_flags/development/diff_check_with_paths_changed_rpc.yml b/config/feature_flags/development/usage_data_i_code_review_mr_diffs.yml
index d67624deb41..a85ceaf2520 100644
--- a/config/feature_flags/development/diff_check_with_paths_changed_rpc.yml
+++ b/config/feature_flags/development/usage_data_i_code_review_mr_diffs.yml
@@ -1,7 +1,7 @@
---
-name: diff_check_with_paths_changed_rpc
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46116
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/288827
+name: usage_data_i_code_review_mr_diffs
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48470
+rollout_issue_url:
milestone: '13.7'
type: development
group: group::code review
diff --git a/config/feature_flags/development/usage_data_i_code_review_mr_single_file_diffs.yml b/config/feature_flags/development/usage_data_i_code_review_mr_single_file_diffs.yml
new file mode 100644
index 00000000000..cc9623f6cf4
--- /dev/null
+++ b/config/feature_flags/development/usage_data_i_code_review_mr_single_file_diffs.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_i_code_review_mr_single_file_diffs
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48470
+rollout_issue_url:
+milestone: '13.7'
+type: development
+group: group::code review
+default_enabled: true
diff --git a/config/feature_flags/development/mr_commit_neighbor_nav.yml b/config/feature_flags/development/usage_data_i_code_review_user_close_mr.yml
index 1605aaa80e4..777914da403 100644
--- a/config/feature_flags/development/mr_commit_neighbor_nav.yml
+++ b/config/feature_flags/development/usage_data_i_code_review_user_close_mr.yml
@@ -1,8 +1,8 @@
---
-name: mr_commit_neighbor_nav
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28596
+name: usage_data_i_code_review_user_close_mr
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50654
rollout_issue_url:
-milestone: '13.0'
+milestone: '13.8'
type: development
group: group::code review
default_enabled: true
diff --git a/config/feature_flags/development/hide_jump_to_next_unresolved_in_threads.yml b/config/feature_flags/development/usage_data_i_code_review_user_create_mr.yml
index 0eda7b1ca4f..beb211c6f35 100644
--- a/config/feature_flags/development/hide_jump_to_next_unresolved_in_threads.yml
+++ b/config/feature_flags/development/usage_data_i_code_review_user_create_mr.yml
@@ -1,8 +1,8 @@
---
-name: hide_jump_to_next_unresolved_in_threads
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37873
+name: usage_data_i_code_review_user_create_mr
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50654
rollout_issue_url:
-milestone: '13.3'
+milestone: '13.8'
type: development
group: group::code review
default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_create_mr_comment.yml b/config/feature_flags/development/usage_data_i_code_review_user_create_mr_comment.yml
new file mode 100644
index 00000000000..1c727263a8e
--- /dev/null
+++ b/config/feature_flags/development/usage_data_i_code_review_user_create_mr_comment.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_i_code_review_user_create_mr_comment
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50849
+rollout_issue_url:
+milestone: '13.8'
+type: development
+group: group::code review
+default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_create_multiline_mr_comment.yml b/config/feature_flags/development/usage_data_i_code_review_user_create_multiline_mr_comment.yml
new file mode 100644
index 00000000000..4777926d4b1
--- /dev/null
+++ b/config/feature_flags/development/usage_data_i_code_review_user_create_multiline_mr_comment.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_i_code_review_user_create_multiline_mr_comment
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51098
+rollout_issue_url:
+milestone: '13.8'
+type: development
+group: group::code review
+default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_create_review_note.yml b/config/feature_flags/development/usage_data_i_code_review_user_create_review_note.yml
new file mode 100644
index 00000000000..fdc3b4569ef
--- /dev/null
+++ b/config/feature_flags/development/usage_data_i_code_review_user_create_review_note.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_i_code_review_user_create_review_note
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51521
+rollout_issue_url:
+milestone: '13.8'
+type: development
+group: group::code review
+default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_edit_mr_comment.yml b/config/feature_flags/development/usage_data_i_code_review_user_edit_mr_comment.yml
new file mode 100644
index 00000000000..2280cfdd564
--- /dev/null
+++ b/config/feature_flags/development/usage_data_i_code_review_user_edit_mr_comment.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_i_code_review_user_edit_mr_comment
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50849
+rollout_issue_url:
+milestone: '13.8'
+type: development
+group: group::code review
+default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_edit_multiline_mr_comment.yml b/config/feature_flags/development/usage_data_i_code_review_user_edit_multiline_mr_comment.yml
new file mode 100644
index 00000000000..b4b34b4e166
--- /dev/null
+++ b/config/feature_flags/development/usage_data_i_code_review_user_edit_multiline_mr_comment.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_i_code_review_user_edit_multiline_mr_comment
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51098
+rollout_issue_url:
+milestone: '13.8'
+type: development
+group: group::code review
+default_enabled: true
diff --git a/config/feature_flags/development/widget_visibility_polling.yml b/config/feature_flags/development/usage_data_i_code_review_user_merge_mr.yml
index 3021388b17f..0ef596ac915 100644
--- a/config/feature_flags/development/widget_visibility_polling.yml
+++ b/config/feature_flags/development/usage_data_i_code_review_user_merge_mr.yml
@@ -1,8 +1,8 @@
---
-name: widget_visibility_polling
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/29318
+name: usage_data_i_code_review_user_merge_mr
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50654
rollout_issue_url:
-milestone: '12.10'
+milestone: '13.8'
type: development
group: group::code review
default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_publish_review.yml b/config/feature_flags/development/usage_data_i_code_review_user_publish_review.yml
new file mode 100644
index 00000000000..079ceb023f4
--- /dev/null
+++ b/config/feature_flags/development/usage_data_i_code_review_user_publish_review.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_i_code_review_user_publish_review
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51351
+rollout_issue_url:
+milestone: '13.8'
+type: development
+group: group::code review
+default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_remove_mr_comment.yml b/config/feature_flags/development/usage_data_i_code_review_user_remove_mr_comment.yml
new file mode 100644
index 00000000000..c7d462e9243
--- /dev/null
+++ b/config/feature_flags/development/usage_data_i_code_review_user_remove_mr_comment.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_i_code_review_user_remove_mr_comment
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50849
+rollout_issue_url:
+milestone: '13.8'
+type: development
+group: group::code review
+default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_remove_multiline_mr_comment.yml b/config/feature_flags/development/usage_data_i_code_review_user_remove_multiline_mr_comment.yml
new file mode 100644
index 00000000000..b8ec5984788
--- /dev/null
+++ b/config/feature_flags/development/usage_data_i_code_review_user_remove_multiline_mr_comment.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_i_code_review_user_remove_multiline_mr_comment
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51098
+rollout_issue_url:
+milestone: '13.8'
+type: development
+group: group::code review
+default_enabled: true
diff --git a/config/feature_flags/development/merge_orchestration_service.yml b/config/feature_flags/development/usage_data_i_code_review_user_reopen_mr.yml
index 52de3b6e733..9a5c2ecc26a 100644
--- a/config/feature_flags/development/merge_orchestration_service.yml
+++ b/config/feature_flags/development/usage_data_i_code_review_user_reopen_mr.yml
@@ -1,8 +1,8 @@
---
-name: merge_orchestration_service
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28532
+name: usage_data_i_code_review_user_reopen_mr
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50654
rollout_issue_url:
-milestone: '12.10'
+milestone: '13.8'
type: development
-group: group::continuous integration
+group: group::code review
default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_single_file_diffs.yml b/config/feature_flags/development/usage_data_i_code_review_user_single_file_diffs.yml
new file mode 100644
index 00000000000..f77b15f9442
--- /dev/null
+++ b/config/feature_flags/development/usage_data_i_code_review_user_single_file_diffs.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_i_code_review_user_single_file_diffs
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48470
+rollout_issue_url:
+milestone: '13.7'
+type: development
+group: group::code review
+default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_testing_full_code_quality_report_total.yml b/config/feature_flags/development/usage_data_i_testing_full_code_quality_report_total.yml
new file mode 100644
index 00000000000..38bce2529dd
--- /dev/null
+++ b/config/feature_flags/development/usage_data_i_testing_full_code_quality_report_total.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_i_testing_full_code_quality_report_total
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49079
+rollout_issue_url:
+milestone: '13.8'
+type: development
+group: group::testing
+default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_testing_group_code_coverage_visit_total.yml b/config/feature_flags/development/usage_data_i_testing_group_code_coverage_visit_total.yml
new file mode 100644
index 00000000000..720b94fcf6e
--- /dev/null
+++ b/config/feature_flags/development/usage_data_i_testing_group_code_coverage_visit_total.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_i_testing_group_code_coverage_visit_total
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51382
+rollout_issue_url:
+milestone: '13.8'
+type: development
+group: group::testing
+default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_testing_metrics_report_widget_total.yml b/config/feature_flags/development/usage_data_i_testing_metrics_report_widget_total.yml
new file mode 100644
index 00000000000..2c086b211ba
--- /dev/null
+++ b/config/feature_flags/development/usage_data_i_testing_metrics_report_widget_total.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_i_testing_metrics_report_widget_total
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50790
+rollout_issue_url:
+milestone: '13.8'
+type: development
+group: group::testing
+default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_testing_web_performance_widget_total.yml b/config/feature_flags/development/usage_data_i_testing_web_performance_widget_total.yml
new file mode 100644
index 00000000000..6efb6bea040
--- /dev/null
+++ b/config/feature_flags/development/usage_data_i_testing_web_performance_widget_total.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_i_testing_web_performance_widget_total
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46746
+rollout_issue_url:
+milestone: '13.8'
+type: development
+group: group::testing
+default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_alerts_total_unique_counts.yml b/config/feature_flags/development/usage_data_incident_management_alerts_total_unique_counts.yml
deleted file mode 100644
index 38e94e74399..00000000000
--- a/config/feature_flags/development/usage_data_incident_management_alerts_total_unique_counts.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_incident_management_alerts_total_unique_counts
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48087
-rollout_issue_url:
-milestone: '13.7'
-type: development
-group: group::monitor
-default_enabled: false
diff --git a/config/feature_flags/development/usage_data_incident_management_incidents_total_unique_counts.yml b/config/feature_flags/development/usage_data_incident_management_incidents_total_unique_counts.yml
deleted file mode 100644
index 1bb602730e7..00000000000
--- a/config/feature_flags/development/usage_data_incident_management_incidents_total_unique_counts.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_incident_management_incidents_total_unique_counts
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48087
-rollout_issue_url:
-milestone: '13.7'
-type: development
-group: group::monitor
-default_enabled: false
diff --git a/config/feature_flags/development/usage_data_p_terraform_state_api_unique_users.yml b/config/feature_flags/development/usage_data_p_terraform_state_api_unique_users.yml
new file mode 100644
index 00000000000..e11fb0a8b25
--- /dev/null
+++ b/config/feature_flags/development/usage_data_p_terraform_state_api_unique_users.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_p_terraform_state_api_unique_users
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50224
+rollout_issue_url:
+milestone: '13.8'
+type: development
+group: group::configure
+default_enabled: true
diff --git a/config/feature_flags/development/coverage_fuzzing_mr_widget.yml b/config/feature_flags/development/usage_data_track_ci_templates_unique_projects.yml
index 589b7073b22..306e37ac308 100644
--- a/config/feature_flags/development/coverage_fuzzing_mr_widget.yml
+++ b/config/feature_flags/development/usage_data_track_ci_templates_unique_projects.yml
@@ -1,8 +1,8 @@
---
-name: coverage_fuzzing_mr_widget
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/43545
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/257839
-milestone: '13.6'
+name: usage_data_track_ci_templates_unique_projects
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50481
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/296880
+milestone: '13.8'
type: development
-group: group::fuzz testing
+group: group::configure
default_enabled: true
diff --git a/config/feature_flags/development/ci_pipelines_for_merge_request_finder_new_cte.yml b/config/feature_flags/development/value_stream_analytics_extended_form.yml
index 84d45d51c78..1cdb9111af4 100644
--- a/config/feature_flags/development/ci_pipelines_for_merge_request_finder_new_cte.yml
+++ b/config/feature_flags/development/value_stream_analytics_extended_form.yml
@@ -1,8 +1,8 @@
---
-name: ci_pipelines_for_merge_request_finder_new_cte
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49083
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/291006
+name: value_stream_analytics_extended_form
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50229
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/294190
milestone: '13.7'
type: development
-group: group::continuous integration
+group: group::optimize
default_enabled: false
diff --git a/config/feature_flags/development/variable_inside_variable.yml b/config/feature_flags/development/variable_inside_variable.yml
new file mode 100644
index 00000000000..1e75576a97a
--- /dev/null
+++ b/config/feature_flags/development/variable_inside_variable.yml
@@ -0,0 +1,8 @@
+---
+name: variable_inside_variable
+introduced_by_url:
+rollout_issue_url:
+milestone: '13.7'
+type: development
+group: group::runner
+default_enabled: false
diff --git a/config/feature_flags/development/variables_in_include_section_ci.yml b/config/feature_flags/development/variables_in_include_section_ci.yml
new file mode 100644
index 00000000000..f6fc810e6f2
--- /dev/null
+++ b/config/feature_flags/development/variables_in_include_section_ci.yml
@@ -0,0 +1,8 @@
+---
+name: variables_in_include_section_ci
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50188/
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/294294
+milestone: '13.8'
+type: development
+group: group::compliance
+default_enabled: false
diff --git a/config/feature_flags/development/vue_group_members_list.yml b/config/feature_flags/development/vue_group_members_list.yml
deleted file mode 100644
index d864f904992..00000000000
--- a/config/feature_flags/development/vue_group_members_list.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: vue_group_members_list
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40548
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/241194
-milestone: '13.4'
-type: development
-group: group::access
-default_enabled: true
diff --git a/config/feature_flags/development/wiki.yml b/config/feature_flags/development/wiki.yml
index 5904e6838f3..008852d2c13 100644
--- a/config/feature_flags/development/wiki.yml
+++ b/config/feature_flags/development/wiki.yml
@@ -4,5 +4,5 @@ introduced_by_url:
rollout_issue_url:
milestone:
type: development
-group:
+group: group::editor
default_enabled: true
diff --git a/config/feature_flags/development/wiki_front_matter.yml b/config/feature_flags/development/wiki_front_matter.yml
index 66add349c44..39196440d17 100644
--- a/config/feature_flags/development/wiki_front_matter.yml
+++ b/config/feature_flags/development/wiki_front_matter.yml
@@ -1,8 +1,8 @@
---
name: wiki_front_matter
-introduced_by_url:
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27706
rollout_issue_url:
-milestone:
+milestone: '12.10'
type: development
-group:
+group: group::editor
default_enabled: false
diff --git a/config/feature_flags/experiment/ci_syntax_templates_experiment_percentage.yml b/config/feature_flags/experiment/ci_syntax_templates_experiment_percentage.yml
new file mode 100644
index 00000000000..3ed457acce8
--- /dev/null
+++ b/config/feature_flags/experiment/ci_syntax_templates_experiment_percentage.yml
@@ -0,0 +1,8 @@
+---
+name: ci_syntax_templates_experiment_percentage
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48141
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/281057
+milestone: '13.8'
+type: experiment
+group: group::activation
+default_enabled: false
diff --git a/config/feature_flags/experiment/customize_homepage_experiment_percentage.yml b/config/feature_flags/experiment/customize_homepage_experiment_percentage.yml
new file mode 100644
index 00000000000..eff0d2785eb
--- /dev/null
+++ b/config/feature_flags/experiment/customize_homepage_experiment_percentage.yml
@@ -0,0 +1,8 @@
+---
+name: customize_homepage_experiment_percentage
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39348
+rollout_issue_url: https://gitlab.com/gitlab-org/growth/team-tasks/-/issues/187
+milestone: '13.4'
+type: experiment
+group: group::expansion
+default_enabled: false
diff --git a/config/feature_flags/development/feature_flags_legacy_read_only.yml b/config/feature_flags/experiment/default_to_issues_board_experiment_percentage.yml
index b960d2df1fa..d4a695502f9 100644
--- a/config/feature_flags/development/feature_flags_legacy_read_only.yml
+++ b/config/feature_flags/experiment/default_to_issues_board_experiment_percentage.yml
@@ -1,8 +1,8 @@
---
-name: feature_flags_legacy_read_only
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38353
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/240985
-milestone: '13.3'
-type: development
-group: group::progressive delivery
+name: default_to_issues_board_experiment_percentage
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/43939
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/268298
+milestone: '13.5'
+type: experiment
+group: group::conversion
default_enabled: true
diff --git a/config/feature_flags/experiment/invite_members_empty_group_version_a_experiment_percentage.yml b/config/feature_flags/experiment/invite_members_empty_group_version_a_experiment_percentage.yml
new file mode 100644
index 00000000000..6f8186a6888
--- /dev/null
+++ b/config/feature_flags/experiment/invite_members_empty_group_version_a_experiment_percentage.yml
@@ -0,0 +1,8 @@
+---
+name: invite_members_empty_group_version_a_experiment_percentage
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45689
+rollout_issue_url: https://gitlab.com/gitlab-org/growth/team-tasks/-/issues/280
+milestone: '13.6'
+type: experiment
+group: group::expansion
+default_enabled: false
diff --git a/config/feature_flags/development/feature_flags_legacy_read_only_override.yml b/config/feature_flags/experiment/invite_members_empty_project_version_a_experiment_percentage.yml
index 28438a130f4..8b91ec9526c 100644
--- a/config/feature_flags/development/feature_flags_legacy_read_only_override.yml
+++ b/config/feature_flags/experiment/invite_members_empty_project_version_a_experiment_percentage.yml
@@ -1,8 +1,8 @@
---
-name: feature_flags_legacy_read_only_override
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40431
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/240985
-milestone: '13.4'
-type: development
-group: group::progressive delivery
+name: invite_members_empty_project_version_a_experiment_percentage
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49588
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/262014
+milestone: '13.7'
+type: experiment
+group: group::expansion
default_enabled: false
diff --git a/config/feature_flags/experiment/invite_members_new_dropdown_experiment_percentage.yml b/config/feature_flags/experiment/invite_members_new_dropdown_experiment_percentage.yml
new file mode 100644
index 00000000000..6fac63b381c
--- /dev/null
+++ b/config/feature_flags/experiment/invite_members_new_dropdown_experiment_percentage.yml
@@ -0,0 +1,8 @@
+---
+name: invite_members_new_dropdown_experiment_percentage
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50069
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/268129
+milestone: '13.8'
+type: experiment
+group: group::expansion
+default_enabled: false
diff --git a/config/feature_flags/experiment/invite_members_version_a_experiment_percentage.yml b/config/feature_flags/experiment/invite_members_version_a_experiment_percentage.yml
new file mode 100644
index 00000000000..d20cb10fcda
--- /dev/null
+++ b/config/feature_flags/experiment/invite_members_version_a_experiment_percentage.yml
@@ -0,0 +1,8 @@
+---
+name: invite_members_version_a_experiment_percentage
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/33210
+rollout_issue_url: https://gitlab.com/gitlab-org/growth/team-tasks/-/issues/299
+milestone: '13.1'
+type: experiment
+group: group::expansion
+default_enabled: false
diff --git a/config/feature_flags/experiment/invite_members_version_b_experiment_percentage.yml b/config/feature_flags/experiment/invite_members_version_b_experiment_percentage.yml
new file mode 100644
index 00000000000..069e740ba44
--- /dev/null
+++ b/config/feature_flags/experiment/invite_members_version_b_experiment_percentage.yml
@@ -0,0 +1,8 @@
+---
+name: invite_members_version_b_experiment_percentage
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/43900
+rollout_issue_url: https://gitlab.com/gitlab-org/growth/team-tasks/-/issues/214
+milestone: '13.5'
+type: experiment
+group: group::expansion
+default_enabled: false
diff --git a/config/feature_flags/experiment/jobs_empty_state_experiment_percentage.yml b/config/feature_flags/experiment/jobs_empty_state_experiment_percentage.yml
new file mode 100644
index 00000000000..33a15e28d44
--- /dev/null
+++ b/config/feature_flags/experiment/jobs_empty_state_experiment_percentage.yml
@@ -0,0 +1,8 @@
+---
+name: jobs_empty_state_experiment_percentage
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48686
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/281054
+milestone: '13.7'
+type: experiment
+group: group::activation
+default_enabled: false
diff --git a/config/feature_flags/experiment/null_hypothesis.yml b/config/feature_flags/experiment/null_hypothesis.yml
index 716b0711ef1..8ac76809842 100644
--- a/config/feature_flags/experiment/null_hypothesis.yml
+++ b/config/feature_flags/experiment/null_hypothesis.yml
@@ -2,6 +2,7 @@
name: null_hypothesis
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45840
rollout_issue_url:
+milestone: '13.7'
type: experiment
group: group::adoption
default_enabled: false
diff --git a/config/feature_flags/development/github_import_pull_request_reviews.yml b/config/feature_flags/experiment/onboarding_issues_experiment_percentage.yml
index 38ff6b65eaa..7a8f3074d96 100644
--- a/config/feature_flags/development/github_import_pull_request_reviews.yml
+++ b/config/feature_flags/experiment/onboarding_issues_experiment_percentage.yml
@@ -1,8 +1,8 @@
---
-name: github_import_pull_request_reviews
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48632
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/289153
-milestone: '13.7'
-type: development
-group: group::import
+name: onboarding_issues_experiment_percentage
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/31656/
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/224515
+milestone: '13.0'
+type: experiment
+group: group::conversion
default_enabled: true
diff --git a/config/feature_flags/experiment/pipelines_empty_state_experiment_percentage.yml b/config/feature_flags/experiment/pipelines_empty_state_experiment_percentage.yml
new file mode 100644
index 00000000000..beb8e8a21c6
--- /dev/null
+++ b/config/feature_flags/experiment/pipelines_empty_state_experiment_percentage.yml
@@ -0,0 +1,8 @@
+---
+name: pipelines_empty_state_experiment_percentage
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47952
+rollout_issue_url: https://gitlab.com/gitlab-org/growth/team-tasks/-/issues/289
+milestone: '13.8'
+type: experiment
+group: group::activation
+default_enabled: false
diff --git a/config/feature_flags/development/jira_connect_full_namespace_sync.yml b/config/feature_flags/ops/explore_pipeline_status.yml
index 90fe97be409..ace73a14d0c 100644
--- a/config/feature_flags/development/jira_connect_full_namespace_sync.yml
+++ b/config/feature_flags/ops/explore_pipeline_status.yml
@@ -1,7 +1,8 @@
---
-name: jira_connect_full_namespace_sync
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/43880
+name: explore_pipeline_status
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51621
rollout_issue_url:
-type: development
-group: group::ecosystem
+milestone: '13.8'
+type: ops
+group: group::source code
default_enabled: false
diff --git a/config/feature_flags/ops/scalability_ci_fetch_sha.yml b/config/feature_flags/ops/scalability_ci_fetch_sha.yml
new file mode 100644
index 00000000000..e8133f16072
--- /dev/null
+++ b/config/feature_flags/ops/scalability_ci_fetch_sha.yml
@@ -0,0 +1,8 @@
+---
+name: scalability_ci_fetch_sha
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51208
+rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/746
+milestone: '13.8'
+type: ops
+group: team::Scalability
+default_enabled: false
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 57788e55f8f..92e7501d49d 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -436,6 +436,9 @@ production: &base
# Remove expired build artifacts
expire_build_artifacts_worker:
cron: "*/7 * * * *"
+ # Remove expired pipeline artifacts
+ ci_pipelines_expire_artifacts_worker:
+ cron: "*/23 * * * *"
# Remove files from object storage
ci_schedule_delete_objects_worker:
cron: "*/16 * * * *"
@@ -477,7 +480,7 @@ production: &base
ee_cron_jobs:
# Schedule snapshots for all devops adoption segments
analytics_devops_adoption_create_all_snapshots_worker:
- cron: 0 0 1 * *
+ cron: 0 4 * * *
# Snapshot active users statistics
historical_data_worker:
@@ -1207,10 +1210,7 @@ production: &base
# yourself, and then update the values here.
# https://docs.gitlab.com/ee/administration/monitoring/prometheus/
prometheus:
- # Do not use `enable` and `listen_address` in any new code, as they are deprecated. Use `server_address` instead.
- # https://gitlab.com/gitlab-org/gitlab/-/issues/227111
- # enable: true
- # listen_address: 'localhost:9090'
+ # enabled: true
# server_address: 'localhost:9090'
## Consul settings
@@ -1499,8 +1499,8 @@ test:
group_base: 'ou=groups,dc=example,dc=com'
admin_group: ''
prometheus:
- enable: true
- listen_address: 'localhost:9090'
+ enabled: true
+ server_address: 'localhost:9090'
staging:
<<: *base
diff --git a/config/helpers/is_eslint.js b/config/helpers/is_eslint.js
index 55ec42e68c1..60528796962 100644
--- a/config/helpers/is_eslint.js
+++ b/config/helpers/is_eslint.js
@@ -1,7 +1,7 @@
/**
* Returns true if the given module is required from eslint
*/
-const isESLint = mod => {
+const isESLint = (mod) => {
let parent = mod.parent;
while (parent) {
diff --git a/config/helpers/vendor_dll_hash.js b/config/helpers/vendor_dll_hash.js
index cfd7be66ad3..2df97e7b95d 100644
--- a/config/helpers/vendor_dll_hash.js
+++ b/config/helpers/vendor_dll_hash.js
@@ -9,13 +9,9 @@ const CACHE_PATHS = [
'./yarn.lock',
];
-const resolvePath = file => path.resolve(__dirname, '../..', file);
-const readFile = file => fs.readFileSync(file);
-const fileHash = buffer =>
- crypto
- .createHash('md5')
- .update(buffer)
- .digest('hex');
+const resolvePath = (file) => path.resolve(__dirname, '../..', file);
+const readFile = (file) => fs.readFileSync(file);
+const fileHash = (buffer) => crypto.createHash('md5').update(buffer).digest('hex');
module.exports = () => {
const fileBuffers = CACHE_PATHS.map(resolvePath).map(readFile);
diff --git a/config/initializers/0_inject_feature_flags.rb b/config/initializers/0_inject_feature_flags.rb
index 74470a6cbfc..5b33b3bb4ea 100644
--- a/config/initializers/0_inject_feature_flags.rb
+++ b/config/initializers/0_inject_feature_flags.rb
@@ -4,42 +4,3 @@
Feature.register_feature_groups
Feature.register_definitions
Feature.register_hot_reloader unless Rails.configuration.cache_classes
-
-# This disallows usage of licensed feature names with the same name
-# as feature flags. This naming collision creates confusion and it was
-# decided to be removed in favor of explicit check.
-# https://gitlab.com/gitlab-org/gitlab/-/issues/259611
-if Gitlab.ee? && Gitlab.dev_or_test_env?
- # These are the names of feature flags that do violate the constraint of
- # being unique to licensed names. These feature flags should be reworked to
- # be "development" with explicit check
- IGNORED_FEATURE_FLAGS = %i[
- swimlanes
- ].to_set
-
- # First, we validate a list of overrides to ensure that these overrides
- # are removed if feature flag is gone
- missing_feature_flags = IGNORED_FEATURE_FLAGS.reject do |feature_flag|
- Feature::Definition.definitions[feature_flag]
- end
-
- if missing_feature_flags.any?
- raise "The following feature flags were added as an override for discovering licensed features. " \
- "Since these feature flags seems to be gone, ensure to remove them from \`IGNORED_FEATURE_FLAGS\` " \
- "in \`#{__FILE__}'`: #{missing_feature_flags.join(", ")}"
- end
-
- # Second, we validate that there's no feature flag under the name as licensed feature
- # flag, to ensure that the name used, is unique
- licensed_features = License::PLANS_BY_FEATURE.keys.select do |licensed_feature_name|
- IGNORED_FEATURE_FLAGS.exclude?(licensed_feature_name) &&
- Feature::Definition.definitions[licensed_feature_name]
- end
-
- if licensed_features.any?
- raise "The following feature flags do use a licensed feature. " \
- "To avoid the confusion between their usage it is disallowed to use feature flag " \
- "with exact the same name as licensed feature name. Use a different name to create " \
- "a distinction: #{licensed_features.join(", ")}"
- end
-end
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 97c0e051f1f..b3ea72fc7e5 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -420,6 +420,9 @@ Settings.cron_jobs['pipeline_schedule_worker']['job_class'] = 'PipelineScheduleW
Settings.cron_jobs['expire_build_artifacts_worker'] ||= Settingslogic.new({})
Settings.cron_jobs['expire_build_artifacts_worker']['cron'] ||= '*/7 * * * *'
Settings.cron_jobs['expire_build_artifacts_worker']['job_class'] = 'ExpireBuildArtifactsWorker'
+Settings.cron_jobs['ci_pipelines_expire_artifacts_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['ci_pipelines_expire_artifacts_worker']['cron'] ||= '*/23 * * * *'
+Settings.cron_jobs['ci_pipelines_expire_artifacts_worker']['job_class'] = 'Ci::PipelineArtifacts::ExpireArtifactsWorker'
Settings.cron_jobs['ci_schedule_delete_objects_worker'] ||= Settingslogic.new({})
Settings.cron_jobs['ci_schedule_delete_objects_worker']['cron'] ||= '*/16 * * * *'
Settings.cron_jobs['ci_schedule_delete_objects_worker']['job_class'] = 'Ci::ScheduleDeleteObjectsCronWorker'
@@ -543,7 +546,7 @@ Settings.cron_jobs['manage_evidence_worker']['job_class'] = 'Releases::ManageEvi
Gitlab.ee do
Settings.cron_jobs['analytics_devops_adoption_create_all_snapshots_worker'] ||= Settingslogic.new({})
- Settings.cron_jobs['analytics_devops_adoption_create_all_snapshots_worker']['cron'] ||= '0 0 1 * *'
+ Settings.cron_jobs['analytics_devops_adoption_create_all_snapshots_worker']['cron'] ||= '0 4 * * *'
Settings.cron_jobs['analytics_devops_adoption_create_all_snapshots_worker']['job_class'] = 'Analytics::DevopsAdoption::CreateAllSnapshotsWorker'
Settings.cron_jobs['active_user_count_threshold_worker'] ||= Settingslogic.new({})
Settings.cron_jobs['active_user_count_threshold_worker']['cron'] ||= '0 12 * * *'
@@ -852,6 +855,18 @@ Settings.monitoring.web_exporter['address'] ||= 'localhost'
Settings.monitoring.web_exporter['port'] ||= 8083
#
+# Prometheus settings
+#
+Settings['prometheus'] ||= Settingslogic.new({})
+# TODO: Remove listen_address and enable in GitLab 14.0 and set default value
+# of server_address to be nil and enabled to be false -
+# https://gitlab.com/gitlab-org/gitlab/-/issues/296022
+Settings.prometheus['enable'] ||= false
+Settings.prometheus['listen_address'] ||= nil
+Settings.prometheus['enabled'] = Settings.prometheus['enable'] if Settings.prometheus['enabled'].nil?
+Settings.prometheus['server_address'] ||= Settings.prometheus['listen_address']
+
+#
# Shutdown settings
#
Settings['shutdown'] ||= Settingslogic.new({})
diff --git a/config/initializers/8_devise.rb b/config/initializers/8_devise.rb
index b91a4622ce8..a4841a11a00 100644
--- a/config/initializers/8_devise.rb
+++ b/config/initializers/8_devise.rb
@@ -232,7 +232,7 @@ Devise.setup do |config|
end
if Gitlab::Auth::Ldap::Config.enabled?
- Gitlab::Auth::Ldap::Config.providers.each do |provider|
+ Gitlab::Auth::Ldap::Config.available_providers.each do |provider|
ldap_config = Gitlab::Auth::Ldap::Config.new(provider)
config.omniauth(provider, ldap_config.omniauth_options)
end
diff --git a/config/initializers/carrierwave_patch.rb b/config/initializers/carrierwave_patch.rb
index ad3ff36138f..c8c6f75949c 100644
--- a/config/initializers/carrierwave_patch.rb
+++ b/config/initializers/carrierwave_patch.rb
@@ -17,7 +17,24 @@ module CarrierWave
class Fog < Abstract
class File
def copy_to(new_path)
- connection.copy_object(@uploader.fog_directory, file.key, @uploader.fog_directory, new_path, copy_to_options)
+ # fog-aws needs multipart uploads to copy files above 5 GB,
+ # and it is currently the only Fog provider that supports
+ # multithreaded uploads (https://github.com/fog/fog-aws/pull/579).
+ # Multithreaded uploads are essential for copying large amounts of data
+ # within the request timeout.
+ if ::Feature.enabled?(:s3_multithreaded_uploads, default_enabled: true) && fog_provider == 'AWS'
+ # AWS SDK uses 10 threads by default and a multipart chunk size of 10 MB
+ file.concurrency = 10
+ file.multipart_chunk_size = 10485760
+ file.copy(@uploader.fog_directory, new_path, copy_to_options)
+ else
+ # Some Fog providers may issue a GET request (https://github.com/fog/fog-google/issues/512)
+ # instead of a HEAD request after the transfer completes,
+ # which might cause the file to be downloaded locally.
+ # We fallback to the original copy_object for non-AWS providers.
+ connection.copy_object(@uploader.fog_directory, file.key, @uploader.fog_directory, new_path, copy_to_options)
+ end
+
CarrierWave::Storage::Fog::File.new(@uploader, @base, new_path)
end
diff --git a/config/initializers/grape_patch.rb b/config/initializers/grape_patch.rb
deleted file mode 100644
index a9ac0840541..00000000000
--- a/config/initializers/grape_patch.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-# Monkey patch for Grape v1.4.0: https://github.com/ruby-grape/grape/pull/2088
-
-require 'grape'
-
-# rubocop:disable Gitlab/ModuleWithInstanceVariables
-module Grape
- module DSL
- module InsideRoute
- def stream(value = nil)
- return if value.nil? && @stream.nil?
-
- header 'Content-Length', nil
- header 'Transfer-Encoding', nil
- header 'Cache-Control', 'no-cache' # Skips ETag generation (reading the response up front)
-
- if value.is_a?(String)
- file_body = Grape::ServeStream::FileBody.new(value)
- @stream = Grape::ServeStream::StreamResponse.new(file_body)
- elsif value.respond_to?(:each)
- @stream = Grape::ServeStream::StreamResponse.new(value)
- elsif !value.is_a?(NilClass)
- raise ArgumentError, 'Stream object must respond to :each.'
- else
- @stream
- end
- end
- end
- end
-end
-# rubocop:enable Gitlab/ModuleWithInstanceVariables
diff --git a/config/initializers/postgres_partitioning.rb b/config/initializers/postgres_partitioning.rb
index b3f12c2ceb1..3cea8575cc7 100644
--- a/config/initializers/postgres_partitioning.rb
+++ b/config/initializers/postgres_partitioning.rb
@@ -3,7 +3,7 @@
# Make sure we have loaded partitioned models here
# (even with eager loading disabled).
-Gitlab::Database::Partitioning::PartitionCreator.register(AuditEventPartitioned)
+Gitlab::Database::Partitioning::PartitionCreator.register(AuditEvent)
begin
Gitlab::Database::Partitioning::PartitionCreator.new.create_partitions unless ENV['DISABLE_POSTGRES_PARTITION_CREATION_ON_STARTUP']
diff --git a/config/initializers/trusted_proxies.rb b/config/initializers/trusted_proxies.rb
index 93c4d2b10cc..a4528020c06 100644
--- a/config/initializers/trusted_proxies.rb
+++ b/config/initializers/trusted_proxies.rb
@@ -30,4 +30,4 @@ module TrustedProxyMonkeyPatch
end
end
-ActionDispatch::Request.send(:include, TrustedProxyMonkeyPatch)
+ActionDispatch::Request.include TrustedProxyMonkeyPatch
diff --git a/config/karma.config.js b/config/karma.config.js
index 31fdd5bffd1..1d65e65ce2a 100644
--- a/config/karma.config.js
+++ b/config/karma.config.js
@@ -71,13 +71,13 @@ const createContext = (specFiles, regex, suffix) => {
if (specFilters.length) {
// resolve filters
- let filteredSpecFiles = specFilters.map(filter =>
+ let filteredSpecFiles = specFilters.map((filter) =>
glob
.sync(filter, {
root: ROOT_PATH,
matchBase: true,
})
- .filter(path => path.endsWith('spec.js')),
+ .filter((path) => path.endsWith('spec.js')),
);
// flatten
@@ -92,19 +92,19 @@ if (specFilters.length) {
exit('Your filter did not match any test files.', isError);
}
- if (!filteredSpecFiles.every(file => SPECS_PATH.test(file))) {
+ if (!filteredSpecFiles.every((file) => SPECS_PATH.test(file))) {
exitError('Test files must be located within /spec/javascripts.');
}
- const CE_FILES = filteredSpecFiles.filter(file => !file.startsWith('ee'));
+ const CE_FILES = filteredSpecFiles.filter((file) => !file.startsWith('ee'));
createContext(CE_FILES, /[^e]{2}[\\\/]spec[\\\/]javascripts$/, 'spec/javascripts');
- const EE_FILES = filteredSpecFiles.filter(file => file.startsWith('ee'));
+ const EE_FILES = filteredSpecFiles.filter((file) => file.startsWith('ee'));
createContext(EE_FILES, /ee[\\\/]spec[\\\/]javascripts$/, 'ee/spec/javascripts');
}
// Karma configuration
-module.exports = function(config) {
+module.exports = function (config) {
process.env.TZ = 'Etc/UTC';
const fixturesPath = `tmp/tests/frontend/fixtures${IS_EE ? '-ee' : ''}`;
diff --git a/config/known_invalid_graphql_queries.yml b/config/known_invalid_graphql_queries.yml
new file mode 100644
index 00000000000..8ea9b662aa7
--- /dev/null
+++ b/config/known_invalid_graphql_queries.yml
@@ -0,0 +1,5 @@
+---
+filenames:
+ - ee/app/assets/javascripts/on_demand_scans/graphql/dast_scan_create.mutation.graphql
+ - ee/app/assets/javascripts/oncall_schedules/graphql/mutations/update_oncall_schedule_rotation.mutation.graphql
+ - ee/app/assets/javascripts/oncall_schedules/graphql/mutations/destroy_oncall_rotation.mutation.graphql
diff --git a/config/locales/en.yml b/config/locales/en.yml
index fb024b7ba2a..4615c9a7390 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -169,6 +169,7 @@ en:
format: "%{attribute} %{message}"
messages:
label_already_exists_at_group_level: "already exists at group level for %{group}. Please choose another one."
+ username_exists_as_a_different_namespace: A user, alias, or group already exists with that username.
wrong_size: "is the wrong size (should be %{file_size})"
size_too_small: "is too small (should be at least %{file_size})"
size_too_big: "is too big (should be at most %{file_size})"
diff --git a/config/metrics/counts_28d/deployments.yml b/config/metrics/counts_28d/deployments.yml
new file mode 100644
index 00000000000..dabd50ef5be
--- /dev/null
+++ b/config/metrics/counts_28d/deployments.yml
@@ -0,0 +1,15 @@
+name: deployments
+description: Total deployments count for recent 28 days
+value_type: integer
+stage: release
+status: data_available
+default_generation: generation_1
+full_path:
+ generation_1: counts_monthy.deployments
+milestone: 13.2
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35493
+group: 'group::ops release'
+time_frame: 28d
+data_source: database
+distribution: [ee, ce]
+tier: ['free', 'starter', 'premium', 'ultimate', 'bronze', 'silver', 'gold']
diff --git a/config/metrics/counts_7d/g_project_management_issue_title_changed_weekly.yml b/config/metrics/counts_7d/g_project_management_issue_title_changed_weekly.yml
new file mode 100644
index 00000000000..997263f9e30
--- /dev/null
+++ b/config/metrics/counts_7d/g_project_management_issue_title_changed_weekly.yml
@@ -0,0 +1,16 @@
+name: g_project_management_issue_title_changed_weekly
+description: Distinct users count that changed issue title in a group for last recent week
+value_type: integer
+product_category: issue_tracking
+stage: plan
+status: data_available
+default_generation: generation_1
+full_path:
+ generation_1: redis_hll_counters.issues_edit.g_project_management_issue_title_changed_weekly
+milestone: 13.6
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
+group: 'group::project management'
+time_frame: 7d
+data_source: redis_hll
+distribution: [ee, ce]
+tier: ['free', 'starter', 'premium', 'ultimate', 'bronze', 'silver', 'gold']
diff --git a/config/metrics/counts_all/deployments.yml b/config/metrics/counts_all/deployments.yml
new file mode 100644
index 00000000000..bb78e8d6144
--- /dev/null
+++ b/config/metrics/counts_all/deployments.yml
@@ -0,0 +1,15 @@
+name: deployments
+description: Total deployments count
+value_type: integer
+stage: release
+status: data_available
+default_generation: generation_1
+full_path:
+ generation_1: counts.deployments
+milestone: 8.12
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/735
+group: 'group::ops release'
+time_frame: all
+data_source: database
+distribution: [ee, ce]
+tier: ['free', 'starter', 'premium', 'ultimate', 'bronze', 'silver', 'gold']
diff --git a/config/metrics/license/recorded_at.yml b/config/metrics/license/recorded_at.yml
new file mode 100644
index 00000000000..5b2b3b37290
--- /dev/null
+++ b/config/metrics/license/recorded_at.yml
@@ -0,0 +1,16 @@
+name: recorded_at
+description: When the Usage Ping computation was started
+value_type: string
+product_category: collection
+stage: growth
+status: data_available
+default_generation: generation_1
+full_path:
+ generation_1: recorded_at
+milestone: 8.10
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557
+group: group::product analytics
+time_frame: none
+data_source: ruby
+distribution: [ee, ce]
+tier: ['free', 'starter', 'premium', 'ultimate', 'bronze', 'silver', 'gold']
diff --git a/config/metrics/license/uuid.yml b/config/metrics/license/uuid.yml
new file mode 100644
index 00000000000..38e0d74fc22
--- /dev/null
+++ b/config/metrics/license/uuid.yml
@@ -0,0 +1,17 @@
+name: uuid
+description: GitLab instance unique identifier
+value_type: string
+product_category: collection
+stage: growth
+status: data_available
+default_generation: generation_1
+full_path:
+ generation_1: uuid
+ generation_2: license.uuid
+milestone: 9.1
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1521
+group: group::product analytics
+time_frame: none
+data_source: database
+distribution: [ee, ce]
+tier: ['free', 'starter', 'premium', 'ultimate', 'bronze', 'silver', 'gold']
diff --git a/config/metrics/schema.json b/config/metrics/schema.json
new file mode 100644
index 00000000000..4d1120a7d8d
--- /dev/null
+++ b/config/metrics/schema.json
@@ -0,0 +1,66 @@
+{
+ "type": "object",
+ "required": ["name", "description", "value_type", "status", "default_generation", "full_path", "group", "time_frame", "data_source", "distribution", "tier"],
+ "properties": {
+ "name": {
+ "type": "string"
+ },
+ "description": {
+ "type": "string"
+ },
+ "value_type": {
+ "type": "string",
+ "enum": ["integer", "string", "number", "boolean"]
+ },
+ "product_category": {
+ "type": ["string", "null"]
+ },
+ "stage": {
+ "type": ["string", "null"]
+ },
+ "status": {
+ "type": ["string"],
+ "enum": ["data_available", "planned", "in_progress", "implmented"]
+ },
+ "default_generation": {
+ "type": "string"
+ },
+ "full_path": {
+ "type": "object"
+ },
+ "milestone": {
+ "type": ["number", "null"]
+ },
+ "milestone_removed": {
+ "type": ["number", "null"]
+ },
+ "introduced_by_url": {
+ "type": ["string", "null"]
+ },
+ "group": {
+ "type": "string"
+ },
+ "time_frame": {
+ "type": "string",
+ "enum": ["7d", "28d", "all", "none"]
+ },
+ "data_source": {
+ "type": "string",
+ "enum": ["database", "redis", "redis_hll", "prometheus", "ruby"]
+ },
+ "distribution": {
+ "type": "array",
+ "items": {
+ "type": "string",
+ "enum": ["ee", "ce"]
+ }
+ },
+ "tier": {
+ "type": "array",
+ "items": {
+ "type": "string",
+ "enum": ["free", "starter", "premium", "ultimate", "bronze", "silver", "gold"]
+ }
+ }
+ }
+}
diff --git a/config/metrics/settings/database_adapter.yml b/config/metrics/settings/database_adapter.yml
new file mode 100644
index 00000000000..b24fc933a08
--- /dev/null
+++ b/config/metrics/settings/database_adapter.yml
@@ -0,0 +1,14 @@
+name: adapter
+description: This metric only returns a value of PostgreSQL in supported versions of GitLab. It could be removed from the usage ping. Historically MySQL was also supported.
+value_type: string
+product_category: collection
+stage: growth
+status: data_available
+default_generation: generation_1
+full_path:
+ generation_1: database.adapter
+group: group::enablement distribution
+time_frame: none
+data_source: database
+distribution: [ee, ce]
+tier: ['free', 'starter', 'premium', 'ultimate', 'bronze', 'silver', 'gold']
diff --git a/config/plugins/monaco_webpack.js b/config/plugins/monaco_webpack.js
index 698d1b9b1fa..01d88ca37db 100644
--- a/config/plugins/monaco_webpack.js
+++ b/config/plugins/monaco_webpack.js
@@ -6,7 +6,7 @@ const { languagesArr } = require('monaco-editor-webpack-plugin/out/languages');
// a known issue in the library and this workaround was suggested here:
// https://github.com/pengx17/monaco-yaml/issues/20
-const yamlLang = languagesArr.find(t => t.label === 'yaml');
+const yamlLang = languagesArr.find((t) => t.label === 'yaml');
yamlLang.entry = [yamlLang.entry, '../../monaco-yaml/lib/esm/monaco.contribution'];
yamlLang.worker = {
diff --git a/config/puma.example.development.rb b/config/puma.example.development.rb
index ecbfac660c9..28c2af3acb3 100644
--- a/config/puma.example.development.rb
+++ b/config/puma.example.development.rb
@@ -79,6 +79,16 @@ tag 'gitlab-puma-worker'
#
worker_timeout 60
+# https://github.com/puma/puma/blob/master/5.0-Upgrade.md#lower-latency-better-throughput
+if defined?(wait_for_less_busy_worker)
+ wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LESS_BUSY_WORKER', 0.001).to_f
+end
+
+# https://github.com/puma/puma/blob/master/5.0-Upgrade.md#nakayoshi_fork
+if defined?(nakayoshi_fork)
+ nakayoshi_fork unless ENV['DISABLE_PUMA_NAKAYOSHI_FORK'] == 'true'
+end
+
# Use json formatter
require_relative "/home/git/gitlab/lib/gitlab/puma_logging/json_formatter"
diff --git a/config/puma.rb.example b/config/puma.rb.example
index cd7adca157f..9fc354a8fe8 100644
--- a/config/puma.rb.example
+++ b/config/puma.rb.example
@@ -69,10 +69,20 @@ tag 'gitlab-puma-worker'
#
worker_timeout 60
+# https://github.com/puma/puma/blob/master/5.0-Upgrade.md#lower-latency-better-throughput
+if defined?(wait_for_less_busy_worker)
+ wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LESS_BUSY_WORKER', 0.001).to_f
+end
+
+# https://github.com/puma/puma/blob/master/5.0-Upgrade.md#nakayoshi_fork
+if defined?(nakayoshi_fork)
+ nakayoshi_fork unless ENV['DISABLE_PUMA_NAKAYOSHI_FORK'] == 'true'
+end
+
# Use json formatter
require_relative "/home/git/gitlab/lib/gitlab/puma_logging/json_formatter"
json_formatter = Gitlab::PumaLogging::JSONFormatter.new
log_formatter do |str|
json_formatter.call(str)
-end \ No newline at end of file
+end
diff --git a/config/puma_actioncable.example.development.rb b/config/puma_actioncable.example.development.rb
index c975f9e4f9b..d0da3dcd8f2 100644
--- a/config/puma_actioncable.example.development.rb
+++ b/config/puma_actioncable.example.development.rb
@@ -79,6 +79,16 @@ tag 'gitlab-actioncable-puma-worker'
#
worker_timeout 60
+# https://github.com/puma/puma/blob/master/5.0-Upgrade.md#lower-latency-better-throughput
+if defined?(wait_for_less_busy_worker)
+ wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LESS_BUSY_WORKER', 0.001).to_f
+end
+
+# https://github.com/puma/puma/blob/master/5.0-Upgrade.md#nakayoshi_fork
+if defined?(nakayoshi_fork)
+ nakayoshi_fork unless ENV['DISABLE_PUMA_NAKAYOSHI_FORK'] == 'true'
+end
+
# Use json formatter
require_relative "/home/git/gitlab/lib/gitlab/puma_logging/json_formatter"
diff --git a/config/routes.rb b/config/routes.rb
index 867e5c2ec46..91d1a817175 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -45,7 +45,12 @@ Rails.application.routes.draw do
# Sign up
scope path: '/users/sign_up', module: :registrations, as: :users_sign_up do
- resource :welcome, only: [:show, :update], controller: 'welcome'
+ resource :welcome, only: [:show, :update], controller: 'welcome' do
+ Gitlab.ee do
+ get :trial_getting_started, on: :collection
+ end
+ end
+
resource :experience_level, only: [:show, :update]
Gitlab.ee do
@@ -87,7 +92,10 @@ Rails.application.routes.draw do
# '/-/health' implemented by BasicHealthCheck middleware
get 'liveness' => 'health#liveness'
get 'readiness' => 'health#readiness'
- resources :metrics, only: [:index]
+ controller :metrics do
+ get 'metrics', action: :index
+ get 'metrics/system', action: :system
+ end
mount Peek::Railtie => '/peek', as: 'peek_routes'
get 'runner_setup/platforms' => 'runner_setup#platforms'
@@ -271,7 +279,8 @@ Rails.application.routes.draw do
# Issue https://gitlab.com/gitlab-org/gitlab/-/issues/210024
scope as: 'deprecated' do
draw :snippets
- draw :profile
+
+ Gitlab::Routing.redirect_legacy_paths(self, :profile)
end
Gitlab.ee do
diff --git a/config/routes/group.rb b/config/routes/group.rb
index 38c04369d2f..012d5926872 100644
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
@@ -49,6 +49,8 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
post :reset
end
end
+
+ resources :packages_and_registries, only: [:index]
end
resource :variables, only: [:show, :update]
diff --git a/config/routes/import.rb b/config/routes/import.rb
index 6c99b0320de..5f94fb8d058 100644
--- a/config/routes/import.rb
+++ b/config/routes/import.rb
@@ -63,6 +63,7 @@ namespace :import do
resource :bulk_imports, only: [:create] do
post :configure
get :status
+ get :realtime_changes
end
resource :manifest, only: [:create, :new], controller: :manifest do
diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml
index 6f8c0b352fd..d5b3925131e 100644
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -50,6 +50,8 @@
- 1
- - bulk_import
- 1
+- - bulk_imports_entity
+ - 1
- - chaos
- 2
- - chat_notification
@@ -122,6 +124,8 @@
- 2
- - error_tracking_issue_link
- 1
+- - experiments_record_conversion_event
+ - 1
- - expire_build_instance_artifacts
- 1
- - export_csv
@@ -198,6 +202,8 @@
- 1
- - namespaceless_project_destroy
- 1
+- - namespaces_onboarding_pipeline_created
+ - 1
- - namespaces_onboarding_user_added
- 1
- - new_epic
@@ -318,6 +324,10 @@
- 1
- - set_user_status_based_on_user_cap_setting
- 1
+- - snippet_schedule_bulk_repository_shard_moves
+ - 1
+- - snippet_update_repository_storage
+ - 1
- - status_page_publish
- 1
- - sync_seat_link_request
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 42e27ea1668..958b27d674d 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -63,13 +63,13 @@ function generateEntries() {
autoEntriesMap[chunkName] = `${prefix}/${path}`;
}
- pageEntries.forEach(path => generateAutoEntries(path));
+ pageEntries.forEach((path) => generateAutoEntries(path));
if (IS_EE) {
const eePageEntries = glob.sync('pages/**/index.js', {
cwd: path.join(ROOT_PATH, 'ee/app/assets/javascripts'),
});
- eePageEntries.forEach(path => generateAutoEntries(path, 'ee'));
+ eePageEntries.forEach((path) => generateAutoEntries(path, 'ee'));
watchAutoEntries.push(path.join(ROOT_PATH, 'ee/app/assets/javascripts/pages/'));
}
@@ -77,7 +77,7 @@ function generateEntries() {
autoEntriesCount = autoEntryKeys.length;
// import ancestor entrypoints within their children
- autoEntryKeys.forEach(entry => {
+ autoEntryKeys.forEach((entry) => {
const entryPaths = [autoEntriesMap[entry]];
const segments = entry.split('.');
while (segments.pop()) {
@@ -188,7 +188,7 @@ module.exports = {
},
{
test: /\.js$/,
- exclude: path =>
+ exclude: (path) =>
/node_modules\/(?!tributejs)|node_modules|vendor[\\/]assets/.test(path) &&
!/\.vue\.js/.test(path),
loader: 'babel-loader',
@@ -344,7 +344,7 @@ module.exports = {
// webpack-rails only needs assetsByChunkName to function properly
new StatsWriterPlugin({
filename: 'manifest.json',
- transform: function(data, opts) {
+ transform: function (data, opts) {
const stats = opts.compiler.getStats().toJson({
chunkModules: false,
source: false,
@@ -448,7 +448,7 @@ module.exports = {
]),
!IS_EE &&
- new webpack.NormalModuleReplacementPlugin(/^ee_component\/(.*)\.vue/, resource => {
+ new webpack.NormalModuleReplacementPlugin(/^ee_component\/(.*)\.vue/, (resource) => {
resource.request = path.join(
ROOT_PATH,
'app/assets/javascripts/vue_shared/components/empty_component.js',
@@ -485,14 +485,14 @@ module.exports = {
const missingDeps = Array.from(compilation.missingDependencies);
const nodeModulesPath = path.join(ROOT_PATH, 'node_modules');
const hasMissingNodeModules = missingDeps.some(
- file => file.indexOf(nodeModulesPath) !== -1,
+ (file) => file.indexOf(nodeModulesPath) !== -1,
);
// watch for changes to missing node_modules
if (hasMissingNodeModules) compilation.contextDependencies.add(nodeModulesPath);
// watch for changes to automatic entrypoints
- watchAutoEntries.forEach(watchPath => compilation.contextDependencies.add(watchPath));
+ watchAutoEntries.forEach((watchPath) => compilation.contextDependencies.add(watchPath));
// report our auto-generated bundle count
console.log(
@@ -518,7 +518,7 @@ module.exports = {
);
}
const memoryUsage = process.memoryUsage().heapUsed;
- const toMB = bytes => Math.floor(bytes / 1024 / 1024);
+ const toMB = (bytes) => Math.floor(bytes / 1024 / 1024);
console.log(`Webpack heap size: ${toMB(memoryUsage)} MB`);