Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/application.rb8
-rw-r--r--config/environments/development.rb4
-rw-r--r--config/events/1643968255_projectsnew_select_deployment_target.yml6
-rw-r--r--config/events/1647273260_projectsclustersindex_open_modal.yml6
-rw-r--r--config/events/1647273493_projectsclustersindex_click_button.yml6
-rw-r--r--config/events/1649272430_projectsnew_visit_docs.yml6
-rw-r--r--config/events/1651052988_gitlab__usage_data_counters__ci_template_unique_counter_ci_templates_unique.yml22
-rw-r--r--config/events/202109151015_cluster_services_prometheus_disabled_manual_prometheus.yml2
-rw-r--r--config/events/202109151015_cluster_services_prometheus_enabled_manual_prometheus.yml2
-rw-r--r--config/events/20210915205149_default_dismiss_banner.yml4
-rw-r--r--config/events/20210915205150_default_click_button.yml4
-rw-r--r--config/events/20210915205203_default_click_tab.yml2
-rw-r--r--config/events/20211215022206_default_click_link.yml4
-rw-r--r--config/events/20211215022206_default_environment_actions_click_dropdown.yml4
-rw-r--r--config/events/20211215022206_default_environment_delete_click_button.yml4
-rw-r--r--config/events/20211215022206_default_environment_monitoring_click_button.yml4
-rw-r--r--config/events/20211215022206_default_environment_pin_click_button.yml4
-rw-r--r--config/events/20211215022206_default_environment_rollback_click_button.yml4
-rw-r--r--config/events/20211215022206_default_environment_stop_click_button.yml4
-rw-r--r--config/events/20211215022206_default_environment_terminal_click_button.yml4
-rw-r--r--config/events/20211215022206_default_environment_url_click_button.yml4
-rw-r--r--config/events/20211215022206_default_feature_flag_toggle_click_button.yml4
-rw-r--r--config/events/20211215022206_default_mr_widget_terraform_mr_plan_button_click_terraform_mr_plan_button.yml4
-rw-r--r--config/events/ci_template_included.yml24
-rw-r--r--config/events/g_project_management_issue_assignee_changed.yml25
-rw-r--r--config/events/g_project_management_issue_cloned.yml25
-rw-r--r--config/events/g_project_management_issue_closed.yml25
-rw-r--r--config/events/g_project_management_issue_comment_added.yml25
-rw-r--r--config/events/g_project_management_issue_comment_edited.yml25
-rw-r--r--config/events/g_project_management_issue_comment_removed.yml25
-rw-r--r--config/events/g_project_management_issue_cross_referenced.yml25
-rw-r--r--config/events/g_project_management_issue_description_changed.yml25
-rw-r--r--config/events/g_project_management_issue_design_comments_removed.yml25
-rw-r--r--config/events/g_project_management_issue_designs_added.yml25
-rw-r--r--config/events/g_project_management_issue_designs_modified.yml25
-rw-r--r--config/events/g_project_management_issue_designs_removed.yml25
-rw-r--r--config/events/g_project_management_issue_due_date_changed.yml25
-rw-r--r--config/events/g_project_management_issue_label_changed.yml25
-rw-r--r--config/events/g_project_management_issue_locked.yml25
-rw-r--r--config/events/g_project_management_issue_made_confidential.yml25
-rw-r--r--config/events/g_project_management_issue_made_visible.yml25
-rw-r--r--config/events/g_project_management_issue_marked_as_duplicate.yml25
-rw-r--r--config/events/g_project_management_issue_milestone_changed.yml25
-rw-r--r--config/events/g_project_management_issue_moved.yml25
-rw-r--r--config/events/g_project_management_issue_related.yml25
-rw-r--r--config/events/g_project_management_issue_reopened.yml25
-rw-r--r--config/events/g_project_management_issue_time_estimate_changed.yml25
-rw-r--r--config/events/g_project_management_issue_time_spent_changed.yml25
-rw-r--r--config/events/g_project_management_issue_title_changed.yml25
-rw-r--r--config/events/g_project_management_issue_unlocked.yml25
-rw-r--r--config/events/g_project_management_issue_unrelated.yml25
-rw-r--r--config/events/i_code_review_saved_replies_create.yml24
-rw-r--r--config/events/i_code_review_saved_replies_use.yml24
-rw-r--r--config/events/i_code_review_saved_replies_use_in_mr.yml24
-rw-r--r--config/events/i_code_review_saved_replies_use_in_other.yml24
-rw-r--r--config/feature_categories.yml8
-rw-r--r--config/feature_flags/development/activity_filter_has_mr.yml (renamed from config/feature_flags/development/use_primary_store_as_default_for_queues_metadata.yml)8
-rw-r--r--config/feature_flags/development/additional_merge_when_checks_ready.yml (renamed from config/feature_flags/development/use_primary_and_secondary_stores_for_queues_metadata.yml)8
-rw-r--r--config/feature_flags/development/adherence_report_ui.yml2
-rw-r--r--config/feature_flags/development/admin_group_member.yml (renamed from config/feature_flags/development/api_keyset_pagination_multi_order.yml)6
-rw-r--r--config/feature_flags/development/ai_experimentation_api.yml2
-rw-r--r--config/feature_flags/development/ai_self_discover.yml (renamed from config/feature_flags/development/optimize_routable.yml)8
-rw-r--r--config/feature_flags/development/arkose_labs_prevent_login.yml8
-rw-r--r--config/feature_flags/development/batch_delay_jira_branch_sync_worker.yml8
-rw-r--r--config/feature_flags/development/bulk_add_on_assignment_refresh_worker.yml8
-rw-r--r--config/feature_flags/development/bulk_import_idempotent_workers.yml8
-rw-r--r--config/feature_flags/development/cache_autocomplete_sources_members.yml (renamed from config/feature_flags/development/search_milestones_hide_archived_projects.yml)9
-rw-r--r--config/feature_flags/development/chatops.yml8
-rw-r--r--config/feature_flags/development/check_membership_in_protected_ref_access.yml8
-rw-r--r--config/feature_flags/development/check_path_traversal_middleware.yml8
-rw-r--r--config/feature_flags/development/ci_fix_performance_pipelines_json_endpoint.yml8
-rw-r--r--config/feature_flags/development/code_suggestions_user_assignments.yml (renamed from config/feature_flags/development/enable_hamilton_in_usage_quotas_ui.yml)8
-rw-r--r--config/feature_flags/development/compliance_adherence_report.yml2
-rw-r--r--config/feature_flags/development/compliance_framework_report_ui.yml8
-rw-r--r--config/feature_flags/development/composer_use_ssh_source_urls.yml2
-rw-r--r--config/feature_flags/development/content_editor_on_issues.yml8
-rw-r--r--config/feature_flags/development/coop_header.yml8
-rw-r--r--config/feature_flags/development/create_deployment_only_for_processable_jobs.yml8
-rw-r--r--config/feature_flags/development/create_vulnerability_jira_issue_via_graphql.yml2
-rw-r--r--config/feature_flags/development/database_analyze_on_partitioned_tables.yml8
-rw-r--r--config/feature_flags/development/deploy_key_for_protected_tags.yml8
-rw-r--r--config/feature_flags/development/enable_environments_search_within_folder.yml2
-rw-r--r--config/feature_flags/development/enable_exclusive_lease_double_lock_rw.yml8
-rw-r--r--config/feature_flags/development/enforce_ssh_certificates.yml (renamed from config/feature_flags/development/errors_utf_8_encoding.yml)10
-rw-r--r--config/feature_flags/development/explain_code_snippet.yml8
-rw-r--r--config/feature_flags/development/export_csv_preload_in_batches.yml2
-rw-r--r--config/feature_flags/development/fast_forward_merge_trains_support.yml2
-rw-r--r--config/feature_flags/development/fetch_commits_for_bitbucket_server.yml8
-rw-r--r--config/feature_flags/development/force_autodevops_on_by_default.yml4
-rw-r--r--config/feature_flags/development/geo_pipeline_artifact_replication.yml8
-rw-r--r--config/feature_flags/development/geo_snippet_repository_replication.yml8
-rw-r--r--config/feature_flags/development/gl_analytics_tracking.yml8
-rw-r--r--config/feature_flags/development/hide_snippets_of_banned_users.yml (renamed from config/feature_flags/development/arkose_labs_login_challenge.yml)12
-rw-r--r--config/feature_flags/development/inherit_higher_access_levels_no_cross_join.yml (renamed from config/feature_flags/development/deactivation_email_additional_text.yml)8
-rw-r--r--config/feature_flags/development/invalid_graphql_auth_401.yml8
-rw-r--r--config/feature_flags/development/issue_assignees_widget.yml2
-rw-r--r--config/feature_flags/development/jwt_auth_space_delimited_scopes.yml8
-rw-r--r--config/feature_flags/development/k8s_proxy_pat.yml8
-rw-r--r--config/feature_flags/development/lfs_batch_direct_downloads.yml8
-rw-r--r--config/feature_flags/development/log_execution_time_path_traversal_middleware.yml8
-rw-r--r--config/feature_flags/development/loose_foreign_keys_batch_load_using_union.yml8
-rw-r--r--config/feature_flags/development/manage_project_access_tokens.yml (renamed from config/feature_flags/development/ai_tool_info.yml)8
-rw-r--r--config/feature_flags/development/mobile_devops_projects_promo.yml8
-rw-r--r--config/feature_flags/development/mr_activity_filters.yml8
-rw-r--r--config/feature_flags/development/notifications_todos_buttons.yml (renamed from config/feature_flags/development/move_close_into_dropdown.yml)8
-rw-r--r--config/feature_flags/development/observability_group_tab.yml8
-rw-r--r--config/feature_flags/development/on_demand_scans_runner_tags.yml8
-rw-r--r--config/feature_flags/development/openai_experimentation.yml2
-rw-r--r--config/feature_flags/development/optimize_group_template_query.yml8
-rw-r--r--config/feature_flags/development/packages_protected_packages.yml8
-rw-r--r--config/feature_flags/development/page_specific_styles.yml (renamed from config/feature_flags/development/generate_description_ai.yml)8
-rw-r--r--config/feature_flags/development/print_wiki.yml2
-rw-r--r--config/feature_flags/development/prohibited_tag_name_encoding_check.yml8
-rw-r--r--config/feature_flags/development/project_templates_without_min_access.yml8
-rw-r--r--config/feature_flags/development/rate_limit_oauth_api.yml8
-rw-r--r--config/feature_flags/development/reduced_build_attributes_list_for_rules.yml (renamed from config/feature_flags/development/graphql_job_trace_html_summary_max_size.yml)9
-rw-r--r--config/feature_flags/development/remove_legacy_github_client.yml8
-rw-r--r--config/feature_flags/development/remove_request_stats_for_tracing.yml8
-rw-r--r--config/feature_flags/development/resolve_ambiguous_archives.yml8
-rw-r--r--config/feature_flags/development/restrict_special_characters_in_namespace_path.yml8
-rw-r--r--config/feature_flags/development/scan_execution_policy_pipelines.yml8
-rw-r--r--config/feature_flags/development/server_side_frecent_namespaces.yml8
-rw-r--r--config/feature_flags/development/service_desk_vue_list.yml2
-rw-r--r--config/feature_flags/development/standard_merge_train_ref_merge_commit.yml8
-rw-r--r--config/feature_flags/development/summarize_comments.yml8
-rw-r--r--config/feature_flags/development/use_cluster_shared_state_for_exclusive_lease.yml8
-rw-r--r--config/feature_flags/development/use_embeddings_with_vertex.yml (renamed from config/feature_flags/development/chat_epic_identifier.yml)8
-rw-r--r--config/feature_flags/development/use_gitlab_http_v2.yml (renamed from config/feature_flags/development/gitlab_duo.yml)10
-rw-r--r--config/feature_flags/development/use_offset_pagination_for_canceling_redundant_pipelines.yml8
-rw-r--r--config/feature_flags/development/use_primary_and_secondary_stores_for_workhorse.yml8
-rw-r--r--config/feature_flags/development/use_primary_store_as_default_for_workhorse.yml8
-rw-r--r--config/feature_flags/development/use_traversal_ids.yml8
-rw-r--r--config/feature_flags/development/use_traversal_ids_for_self_and_hierarchy_scopes.yml8
-rw-r--r--config/feature_flags/development/validate_import_decompressed_archive_size.yml2
-rw-r--r--config/feature_flags/development/visible_label_selection_on_metadata.yml8
-rw-r--r--config/feature_flags/development/vsa_predefined_date_ranges.yml (renamed from config/feature_flags/development/ai_related_settings.yml)10
-rw-r--r--config/feature_flags/development/vulnerability_report_grouping.yml4
-rw-r--r--config/feature_flags/experiment/build_ios_app_guide_email.yml8
-rw-r--r--config/feature_flags/experiment/in_product_guidance_environments_webide.yml2
-rw-r--r--config/feature_flags/ops/additional_snowplow_tracking.yml2
-rw-r--r--config/feature_flags/ops/auto_disabling_web_hooks.yml2
-rw-r--r--config/feature_flags/ops/bitbucket_server_user_mapping_by_username.yml2
-rw-r--r--config/feature_flags/ops/certificate_based_clusters.yml2
-rw-r--r--config/feature_flags/ops/ci_unlock_pipelines.yml (renamed from config/feature_flags/ops/skip_rugged_auto_detect.yml)10
-rw-r--r--config/feature_flags/ops/ci_unlock_pipelines_high.yml (renamed from config/feature_flags/ops/gitlab_gtm_datalayer.yml)10
-rw-r--r--config/feature_flags/ops/ci_unlock_pipelines_medium.yml (renamed from config/feature_flags/ops/gtm_nonce.yml)10
-rw-r--r--config/feature_flags/ops/ecomm_instrumentation.yml2
-rw-r--r--config/feature_flags/ops/github_importer_lower_per_page_limit.yml2
-rw-r--r--config/feature_flags/ops/global_search_epics_tab.yml8
-rw-r--r--config/feature_flags/ops/kubernetes_agent_internal_api.yml4
-rw-r--r--config/feature_flags/ops/mask_page_urls.yml2
-rw-r--r--config/feature_flags/ops/override_bulk_import_disabled.yml8
-rw-r--r--config/feature_flags/ops/performance_bar_stats.yml2
-rw-r--r--config/feature_flags/ops/redis_hll_tracking.yml2
-rw-r--r--config/feature_flags/ops/show_gitlab_agent_feedback.yml4
-rw-r--r--config/feature_flags/ops/show_terraform_banner.yml4
-rw-r--r--config/feature_flags/ops/usage_data_api.yml2
-rw-r--r--config/feature_flags/ops/usage_data_non_sql_metrics.yml4
-rw-r--r--config/feature_flags/ops/usage_data_queries_api.yml4
-rw-r--r--config/gitlab.yml.example4
-rw-r--r--config/gitlab_loose_foreign_keys.yml8
-rw-r--r--config/initializers/0_1_yaml_safe_load_file_patch.rb15
-rw-r--r--config/initializers/1_settings.rb28
-rw-r--r--config/initializers/8_devise.rb12
-rw-r--r--config/initializers/click_house.rb17
-rw-r--r--config/initializers/declarative_policy_cached_attributes.rb25
-rw-r--r--config/initializers/doorkeeper.rb9
-rw-r--r--config/initializers/gitlab_http.rb26
-rw-r--r--config/initializers/hangouts_chat_http_override.rb3
-rw-r--r--config/initializers/http_hostname_override.rb52
-rw-r--r--config/initializers/net_http_patch.rb39
-rw-r--r--config/initializers/net_http_response_patch.rb48
-rw-r--r--config/initializers/postgres_partitioning.rb4
-rw-r--r--config/initializers/rest-client-hostname_override.rb2
-rw-r--r--config/initializers_before_autoloader/004_zeitwerk.rb1
-rw-r--r--config/locales/doorkeeper.en.yml41
-rw-r--r--config/metrics/counts_28d/20210216180816_groups.yml6
-rw-r--r--config/metrics/counts_28d/20210216180818_users_created.yml6
-rw-r--r--config/metrics/counts_28d/20210216181050_packages.yml1
-rw-r--r--config/metrics/counts_28d/20210216183627_omniauth_providers.yml6
-rw-r--r--config/metrics/counts_28d/20210216183701_jira.yml1
-rw-r--r--config/metrics/counts_28d/20210216183707_csv.yml1
-rw-r--r--config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml1
-rw-r--r--config/metrics/counts_28d/20210910132229_user_auth_by_provider.yml6
-rw-r--r--config/metrics/counts_28d/20220825232557_count_user_auth.yml6
-rw-r--r--config/metrics/counts_28d/20230620070723_k8s_api_proxy_requests_unique_agents_via_ci_access_monthly.yml3
-rw-r--r--config/metrics/counts_28d/20230927152527_i_quickactions_add_child_monthly.yml26
-rw-r--r--config/metrics/counts_28d/count_distinct_project_id_from_ci_template_included_28d.yml28
-rw-r--r--config/metrics/counts_7d/20230922165258_i_quickactions_set_parent_weekly.yml26
-rw-r--r--config/metrics/counts_7d/20230922165305_i_quickactions_set_parent_monthly.yml26
-rw-r--r--config/metrics/counts_7d/20230927152525_i_quickactions_add_child_weekly.yml26
-rw-r--r--config/metrics/counts_7d/count_distinct_project_id_from_ci_template_included_7d.yml28
-rw-r--r--config/metrics/counts_all/20210216180242_web_ide_commits.yml2
-rw-r--r--config/metrics/counts_all/20210216180654_jira.yml1
-rw-r--r--config/metrics/counts_all/20210216180700_csv.yml1
-rw-r--r--config/metrics/counts_all/20210216180750_groups.yml6
-rw-r--r--config/metrics/counts_all/20210216180752_keys.yml6
-rw-r--r--config/metrics/counts_all/20210216180756_groups.yml6
-rw-r--r--config/metrics/counts_all/20210216180758_users_created.yml6
-rw-r--r--config/metrics/counts_all/20210216182004_commit_comment.yml2
-rw-r--r--config/metrics/counts_all/20210216182006_source_code_pushes.yml2
-rw-r--r--config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml2
-rw-r--r--config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml2
-rw-r--r--config/metrics/counts_all/20210216183400_omniauth_providers.yml6
-rw-r--r--config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml16
-rw-r--r--config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml16
-rw-r--r--config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml16
-rw-r--r--config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml16
-rw-r--r--config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml16
-rw-r--r--config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml16
-rw-r--r--config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml16
-rw-r--r--config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml16
-rw-r--r--config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml16
-rw-r--r--config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml16
-rw-r--r--config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml16
-rw-r--r--config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml16
-rw-r--r--config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml16
-rw-r--r--config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml16
-rw-r--r--config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml16
-rw-r--r--config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml16
-rw-r--r--config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml16
-rw-r--r--config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml16
-rw-r--r--config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml16
-rw-r--r--config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml16
-rw-r--r--config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml16
-rw-r--r--config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml16
-rw-r--r--config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml16
-rw-r--r--config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml16
-rw-r--r--config/metrics/counts_all/20210727095918_in_product_marketing_email_team_short_0_cta_clicked.yml16
-rw-r--r--config/metrics/counts_all/20210727095923_in_product_marketing_email_team_short_0_sent.yml16
-rw-r--r--config/metrics/counts_all/20210727170553_in_product_marketing_email_trial_short_0_cta_clicked.yml16
-rw-r--r--config/metrics/counts_all/20210727170558_in_product_marketing_email_trial_short_0_sent.yml16
-rw-r--r--config/metrics/counts_all/20210729140021_in_product_marketing_email_admin_verify_0_cta_clicked.yml16
-rw-r--r--config/metrics/counts_all/20210729140423_in_product_marketing_email_admin_verify_0_sent.yml16
-rw-r--r--config/metrics/counts_all/20210910132001_user_auth_by_provider.yml6
-rw-r--r--config/metrics/counts_all/20220825232556_count_user_auth.yml6
-rw-r--r--config/metrics/counts_all/20230725195335_i_code_review_saved_replies_count_use.yml10
-rw-r--r--config/metrics/counts_all/20230725200123_i_code_review_saved_replies_count_create.yml10
-rw-r--r--config/metrics/counts_all/20230809084619_connected_agents.yml3
-rw-r--r--config/metrics/counts_all/20230809194308_i_code_review_saved_replies_use_in_mr.yml10
-rw-r--r--config/metrics/counts_all/20230815054809_i_code_review_saved_replies_use_in_other.yml10
-rw-r--r--config/metrics/license/20230926091801_db_enabled.yml22
-rw-r--r--config/metrics/schema.json6
-rw-r--r--config/metrics/settings/20210204124904_gravatar_enabled.yml6
-rw-r--r--config/metrics/settings/20210204124906_ldap_enabled.yml6
-rw-r--r--config/metrics/settings/20210204124910_omniauth_enabled.yml6
-rw-r--r--config/metrics/settings/20210204124918_signup_enabled.yml6
-rw-r--r--config/object_store_settings.rb18
-rw-r--r--config/puma.rb.example13
-rw-r--r--config/routes.rb4
-rw-r--r--config/routes/group.rb7
-rw-r--r--config/routes/organizations.rb6
-rw-r--r--config/routes/project.rb7
-rw-r--r--config/sidekiq_queues.yml40
-rw-r--r--config/webpack.config.js6
255 files changed, 1871 insertions, 977 deletions
diff --git a/config/application.rb b/config/application.rb
index 552a68f6046..4ee2866dad2 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -80,6 +80,7 @@ module Gitlab
require_dependency Rails.root.join('lib/gitlab/middleware/same_site_cookies')
require_dependency Rails.root.join('lib/gitlab/middleware/handle_ip_spoof_attack_error')
require_dependency Rails.root.join('lib/gitlab/middleware/handle_malformed_strings')
+ require_dependency Rails.root.join('lib/gitlab/middleware/path_traversal_check')
require_dependency Rails.root.join('lib/gitlab/middleware/rack_multipart_tempfile_factory')
require_dependency Rails.root.join('lib/gitlab/runtime')
require_dependency Rails.root.join('lib/gitlab/patch/database_config')
@@ -328,6 +329,7 @@ module Gitlab
config.assets.precompile << "page_bundles/notifications.css"
config.assets.precompile << "page_bundles/oncall_schedules.css"
config.assets.precompile << "page_bundles/operations.css"
+ config.assets.precompile << "page_bundles/organizations.css"
config.assets.precompile << "page_bundles/escalation_policies.css"
config.assets.precompile << "page_bundles/pipeline.css"
config.assets.precompile << "page_bundles/pipeline_schedules.css"
@@ -338,6 +340,7 @@ module Gitlab
config.assets.precompile << "page_bundles/profile_two_factor_auth.css"
config.assets.precompile << "page_bundles/profiles/preferences.css"
config.assets.precompile << "page_bundles/project.css"
+ config.assets.precompile << "page_bundles/projects.css"
config.assets.precompile << "page_bundles/projects_edit.css"
config.assets.precompile << "page_bundles/promotions.css"
config.assets.precompile << "page_bundles/releases.css"
@@ -360,6 +363,7 @@ module Gitlab
config.assets.precompile << "page_bundles/wiki.css"
config.assets.precompile << "page_bundles/work_items.css"
config.assets.precompile << "page_bundles/xterm.css"
+ config.assets.precompile << "page_bundles/labels.css"
config.assets.precompile << "lazy_bundles/cropper.css"
config.assets.precompile << "lazy_bundles/gridstack.css"
config.assets.precompile << "performance_bar.css"
@@ -427,7 +431,9 @@ module Gitlab
config.middleware.insert_before ActionDispatch::RemoteIp, ::Gitlab::Middleware::HandleIpSpoofAttackError
- config.middleware.insert_after Rails::Rack::Logger, ::Gitlab::Middleware::HandleMalformedStrings
+ config.middleware.insert_after ActionDispatch::ShowExceptions, ::Gitlab::Middleware::HandleMalformedStrings
+
+ config.middleware.insert_after ::Gitlab::Middleware::HandleMalformedStrings, ::Gitlab::Middleware::PathTraversalCheck
config.middleware.insert_after Rack::Sendfile, ::Gitlab::Middleware::RackMultipartTempfileFactory
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 1060a376369..da95ff13a0d 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -28,6 +28,10 @@ Rails.application.configure do
# Only use best-standards-support built into browsers
config.action_dispatch.best_standards_support = :builtin
+ # There is no need to check if assets are precompiled locally
+ # To debug AssetNotPrecompiled errors locally, set CHECK_PRECOMPILED_ASSETS to true
+ config.assets.check_precompiled_asset = Gitlab::Utils.to_boolean(ENV['CHECK_PRECOMPILED_ASSETS'], default: false)
+
# Do not compress assets
config.assets.compress = false
diff --git a/config/events/1643968255_projectsnew_select_deployment_target.yml b/config/events/1643968255_projectsnew_select_deployment_target.yml
index 19f6f862d1c..8dd2a5ea2f7 100644
--- a/config/events/1643968255_projectsnew_select_deployment_target.yml
+++ b/config/events/1643968255_projectsnew_select_deployment_target.yml
@@ -5,14 +5,14 @@ action: select_deployment_target
label_description: new_project_deployment_target
property_description: selected option (string)
product_section: ops
-product_stage: configure
-product_group: group::configure
+product_stage: deploy
+product_group: group::environments
milestone: "14.8"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79873
distributions:
- ce
- ee
-tiers:
+tiers:
- free
- premium
- ultimate
diff --git a/config/events/1647273260_projectsclustersindex_open_modal.yml b/config/events/1647273260_projectsclustersindex_open_modal.yml
index 065a99e78ef..5ac1a51d550 100644
--- a/config/events/1647273260_projectsclustersindex_open_modal.yml
+++ b/config/events/1647273260_projectsclustersindex_open_modal.yml
@@ -4,14 +4,14 @@ category: default
action: open_modal
label_description: agent_token_creation_modal
product_section: ops
-product_stage: configure
-product_group: group::configure
+product_stage: deploy
+product_group: group::environments
milestone: "14.9"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82690
distributions:
- ce
- ee
-tiers:
+tiers:
- free
- premium
- ultimate
diff --git a/config/events/1647273493_projectsclustersindex_click_button.yml b/config/events/1647273493_projectsclustersindex_click_button.yml
index 2dabfba8204..87a55853ec3 100644
--- a/config/events/1647273493_projectsclustersindex_click_button.yml
+++ b/config/events/1647273493_projectsclustersindex_click_button.yml
@@ -5,14 +5,14 @@ action: click_button
label_description: agent_token_creation_modal
property_description: One of "create-token", "close"
product_section: ops
-product_stage: configure
-product_group: group::configure
+product_stage: deploy
+product_group: group::environments
milestone: "14.9"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82690
distributions:
- ce
- ee
-tiers:
+tiers:
- free
- premium
- ultimate
diff --git a/config/events/1649272430_projectsnew_visit_docs.yml b/config/events/1649272430_projectsnew_visit_docs.yml
index 8a058e12c3b..d855c63fbe0 100644
--- a/config/events/1649272430_projectsnew_visit_docs.yml
+++ b/config/events/1649272430_projectsnew_visit_docs.yml
@@ -4,14 +4,14 @@ category: projects:new
action: visit_docs
label_description: new_project_deployment_target
product_section: ops
-product_stage: configure
-product_group: group::configure
+product_stage: deploy
+product_group: group::environments
milestone: "14.10"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84224
distributions:
- ce
- ee
-tiers:
+tiers:
- free
- premium
- ultimate
diff --git a/config/events/1651052988_gitlab__usage_data_counters__ci_template_unique_counter_ci_templates_unique.yml b/config/events/1651052988_gitlab__usage_data_counters__ci_template_unique_counter_ci_templates_unique.yml
deleted file mode 100644
index 8661cae3391..00000000000
--- a/config/events/1651052988_gitlab__usage_data_counters__ci_template_unique_counter_ci_templates_unique.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-description: Run Pipeline
-category: Gitlab::UsageDataCounters::CiTemplateUniqueCounter
-action: ci_templates_unique
-label_description:
-property_description:
-value_description:
-extra_properties:
-identifiers:
-product_section: ops
-product_stage: configure
-product_group: group::configure
-milestone: "15.0"
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84337
-distributions:
-- ce
-- ee
-tiers:
-- free
-- premium
-- ultimate
-
diff --git a/config/events/202109151015_cluster_services_prometheus_disabled_manual_prometheus.yml b/config/events/202109151015_cluster_services_prometheus_disabled_manual_prometheus.yml
index 7d108ecc778..47cce65b9de 100644
--- a/config/events/202109151015_cluster_services_prometheus_disabled_manual_prometheus.yml
+++ b/config/events/202109151015_cluster_services_prometheus_disabled_manual_prometheus.yml
@@ -8,7 +8,7 @@ extra_properties:
identifiers:
product_section: dev
product_stage: manage
-product_group: group::integrations
+product_group: group::import and integrate
milestone: "14.0"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62645
distributions:
diff --git a/config/events/202109151015_cluster_services_prometheus_enabled_manual_prometheus.yml b/config/events/202109151015_cluster_services_prometheus_enabled_manual_prometheus.yml
index 9a1760f4d1f..885939edbf2 100644
--- a/config/events/202109151015_cluster_services_prometheus_enabled_manual_prometheus.yml
+++ b/config/events/202109151015_cluster_services_prometheus_enabled_manual_prometheus.yml
@@ -8,7 +8,7 @@ extra_properties:
identifiers:
product_section: dev
product_stage: manage
-product_group: group::integrations
+product_group: group::import and integrate
milestone: "14.0"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62645
distributions:
diff --git a/config/events/20210915205149_default_dismiss_banner.yml b/config/events/20210915205149_default_dismiss_banner.yml
index aeb8d25067b..c2be0f27d7f 100644
--- a/config/events/20210915205149_default_dismiss_banner.yml
+++ b/config/events/20210915205149_default_dismiss_banner.yml
@@ -7,8 +7,8 @@ value_description: ""
extra_properties:
identifiers:
product_section: ops
-product_stage: configure
-product_group: group::configure
+product_stage: deploy
+product_group: group::environments
milestone: "14.3"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68467
distributions:
diff --git a/config/events/20210915205150_default_click_button.yml b/config/events/20210915205150_default_click_button.yml
index 20229cc1a72..b48d443a8b7 100644
--- a/config/events/20210915205150_default_click_button.yml
+++ b/config/events/20210915205150_default_click_button.yml
@@ -7,8 +7,8 @@ value_description: ""
extra_properties:
identifiers:
product_section: ops
-product_stage: configure
-product_group: group::configure
+product_stage: deploy
+product_group: group::environments
milestone: "14.3"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68467
distributions:
diff --git a/config/events/20210915205203_default_click_tab.yml b/config/events/20210915205203_default_click_tab.yml
index 64f93f5d0e6..142a2b039dd 100644
--- a/config/events/20210915205203_default_click_tab.yml
+++ b/config/events/20210915205203_default_click_tab.yml
@@ -8,7 +8,7 @@ extra_properties:
identifiers:
product_section: dev
product_stage: manage
-product_group: group::import
+product_group: group::import and integrate
milestone: "13.12"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59452
distributions:
diff --git a/config/events/20211215022206_default_click_link.yml b/config/events/20211215022206_default_click_link.yml
index 19701c482c2..b98172db59f 100644
--- a/config/events/20211215022206_default_click_link.yml
+++ b/config/events/20211215022206_default_click_link.yml
@@ -7,8 +7,8 @@ value_description: ""
extra_properties:
identifiers:
product_section: ops
-product_stage: release
-product_group: group::release
+product_stage: deploy
+product_group: group::environments
milestone: "13.12"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57160
distributions:
diff --git a/config/events/20211215022206_default_environment_actions_click_dropdown.yml b/config/events/20211215022206_default_environment_actions_click_dropdown.yml
index 28e15d17347..656e47ea035 100644
--- a/config/events/20211215022206_default_environment_actions_click_dropdown.yml
+++ b/config/events/20211215022206_default_environment_actions_click_dropdown.yml
@@ -7,8 +7,8 @@ value_description: ""
extra_properties:
identifiers:
product_section: ops
-product_stage: release
-product_group: group::release
+product_stage: deploy
+product_group: group::environments
milestone: "14.2"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66968
distributions:
diff --git a/config/events/20211215022206_default_environment_delete_click_button.yml b/config/events/20211215022206_default_environment_delete_click_button.yml
index 987cda25e56..a23c7a4b7b7 100644
--- a/config/events/20211215022206_default_environment_delete_click_button.yml
+++ b/config/events/20211215022206_default_environment_delete_click_button.yml
@@ -7,8 +7,8 @@ value_description: ""
extra_properties:
identifiers:
product_section: ops
-product_stage: release
-product_group: group::release
+product_stage: deploy
+product_group: group::environments
milestone: "14.2"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66968
distributions:
diff --git a/config/events/20211215022206_default_environment_monitoring_click_button.yml b/config/events/20211215022206_default_environment_monitoring_click_button.yml
index 531efae7b87..46346d6736a 100644
--- a/config/events/20211215022206_default_environment_monitoring_click_button.yml
+++ b/config/events/20211215022206_default_environment_monitoring_click_button.yml
@@ -7,8 +7,8 @@ value_description: ""
extra_properties:
identifiers:
product_section: ops
-product_stage: release
-product_group: group::release
+product_stage: deploy
+product_group: group::environments
milestone: "14.2"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66968
distributions:
diff --git a/config/events/20211215022206_default_environment_pin_click_button.yml b/config/events/20211215022206_default_environment_pin_click_button.yml
index 2a82785dc22..56ff6a711a9 100644
--- a/config/events/20211215022206_default_environment_pin_click_button.yml
+++ b/config/events/20211215022206_default_environment_pin_click_button.yml
@@ -7,8 +7,8 @@ value_description: ""
extra_properties:
identifiers:
product_section: ops
-product_stage: release
-product_group: group::release
+product_stage: deploy
+product_group: group::environments
milestone: "14.2"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66968
distributions:
diff --git a/config/events/20211215022206_default_environment_rollback_click_button.yml b/config/events/20211215022206_default_environment_rollback_click_button.yml
index a9f75daa4bb..aafefa5c056 100644
--- a/config/events/20211215022206_default_environment_rollback_click_button.yml
+++ b/config/events/20211215022206_default_environment_rollback_click_button.yml
@@ -7,8 +7,8 @@ value_description: ""
extra_properties:
identifiers:
product_section: ops
-product_stage: release
-product_group: group::release
+product_stage: deploy
+product_group: group::environments
milestone: "14.2"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66968
distributions:
diff --git a/config/events/20211215022206_default_environment_stop_click_button.yml b/config/events/20211215022206_default_environment_stop_click_button.yml
index 691759fb527..6b6126f9d08 100644
--- a/config/events/20211215022206_default_environment_stop_click_button.yml
+++ b/config/events/20211215022206_default_environment_stop_click_button.yml
@@ -7,8 +7,8 @@ value_description: ""
extra_properties:
identifiers:
product_section: ops
-product_stage: release
-product_group: group::release
+product_stage: deploy
+product_group: group::environments
milestone: "14.2"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66968
distributions:
diff --git a/config/events/20211215022206_default_environment_terminal_click_button.yml b/config/events/20211215022206_default_environment_terminal_click_button.yml
index 784bf99c0fb..4ffe02abbc0 100644
--- a/config/events/20211215022206_default_environment_terminal_click_button.yml
+++ b/config/events/20211215022206_default_environment_terminal_click_button.yml
@@ -7,8 +7,8 @@ value_description: ""
extra_properties:
identifiers:
product_section: ops
-product_stage: release
-product_group: group::release
+product_stage: deploy
+product_group: group::environments
milestone: "14.2"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66968
distributions:
diff --git a/config/events/20211215022206_default_environment_url_click_button.yml b/config/events/20211215022206_default_environment_url_click_button.yml
index 94857c2ad89..fec266f7196 100644
--- a/config/events/20211215022206_default_environment_url_click_button.yml
+++ b/config/events/20211215022206_default_environment_url_click_button.yml
@@ -7,8 +7,8 @@ value_description: ""
extra_properties:
identifiers:
product_section: ops
-product_stage: release
-product_group: group::release
+product_stage: deploy
+product_group: group::environments
milestone: "14.2"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66968
distributions:
diff --git a/config/events/20211215022206_default_feature_flag_toggle_click_button.yml b/config/events/20211215022206_default_feature_flag_toggle_click_button.yml
index 1b28ec91ec5..78e1f038158 100644
--- a/config/events/20211215022206_default_feature_flag_toggle_click_button.yml
+++ b/config/events/20211215022206_default_feature_flag_toggle_click_button.yml
@@ -7,8 +7,8 @@ value_description: ""
extra_properties:
identifiers:
product_section: ops
-product_stage: release
-product_group: group::release
+product_stage: deploy
+product_group: group::environments
milestone: "13.4"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40023
distributions:
diff --git a/config/events/20211215022206_default_mr_widget_terraform_mr_plan_button_click_terraform_mr_plan_button.yml b/config/events/20211215022206_default_mr_widget_terraform_mr_plan_button_click_terraform_mr_plan_button.yml
index 185ba047742..b590595d47f 100644
--- a/config/events/20211215022206_default_mr_widget_terraform_mr_plan_button_click_terraform_mr_plan_button.yml
+++ b/config/events/20211215022206_default_mr_widget_terraform_mr_plan_button_click_terraform_mr_plan_button.yml
@@ -7,8 +7,8 @@ value_description: ""
extra_properties:
identifiers:
product_section: ops
-product_stage: configure
-product_group: group::configure
+product_stage: deploy
+product_group: group::environments
milestone: "13.2"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/34392
distributions:
diff --git a/config/events/ci_template_included.yml b/config/events/ci_template_included.yml
new file mode 100644
index 00000000000..a00fdc628b0
--- /dev/null
+++ b/config/events/ci_template_included.yml
@@ -0,0 +1,24 @@
+---
+description: When a pipeline is created with a CI Template file included in its configuration.
+category: InternalEventTracking
+action: ci_template_included
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: ops
+product_stage: verify
+product_group: pipeline_authoring
+milestone: "16.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132819
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/g_project_management_issue_assignee_changed.yml b/config/events/g_project_management_issue_assignee_changed.yml
new file mode 100644
index 00000000000..37b198b29f9
--- /dev/null
+++ b/config/events/g_project_management_issue_assignee_changed.yml
@@ -0,0 +1,25 @@
+---
+description: An issue assignee was changed
+category: InternalEventTracking
+action: g_project_management_issue_assignee_changed
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: plan
+product_group: project_management
+milestone: "16.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131847
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/g_project_management_issue_cloned.yml b/config/events/g_project_management_issue_cloned.yml
new file mode 100644
index 00000000000..b4caea8fd9b
--- /dev/null
+++ b/config/events/g_project_management_issue_cloned.yml
@@ -0,0 +1,25 @@
+---
+description: An issue was cloned
+category: InternalEventTracking
+action: g_project_management_issue_cloned
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: plan
+product_group: project_management
+milestone: "16.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131847
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/g_project_management_issue_closed.yml b/config/events/g_project_management_issue_closed.yml
new file mode 100644
index 00000000000..d893bf61880
--- /dev/null
+++ b/config/events/g_project_management_issue_closed.yml
@@ -0,0 +1,25 @@
+---
+description: An issue was closed
+category: InternalEventTracking
+action: g_project_management_issue_closed
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: plan
+product_group: project_management
+milestone: "16.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131847
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/g_project_management_issue_comment_added.yml b/config/events/g_project_management_issue_comment_added.yml
new file mode 100644
index 00000000000..9059f258717
--- /dev/null
+++ b/config/events/g_project_management_issue_comment_added.yml
@@ -0,0 +1,25 @@
+---
+description: A comment on an issue was added
+category: InternalEventTracking
+action: g_project_management_issue_comment_added
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: plan
+product_group: project_management
+milestone: "16.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131847
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/g_project_management_issue_comment_edited.yml b/config/events/g_project_management_issue_comment_edited.yml
new file mode 100644
index 00000000000..b4e80af2465
--- /dev/null
+++ b/config/events/g_project_management_issue_comment_edited.yml
@@ -0,0 +1,25 @@
+---
+description: A comment on an issue was edited
+category: InternalEventTracking
+action: g_project_management_issue_comment_edited
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: plan
+product_group: project_management
+milestone: "16.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131847
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/g_project_management_issue_comment_removed.yml b/config/events/g_project_management_issue_comment_removed.yml
new file mode 100644
index 00000000000..bf905fa95fa
--- /dev/null
+++ b/config/events/g_project_management_issue_comment_removed.yml
@@ -0,0 +1,25 @@
+---
+description: A comment on an issue was removed
+category: InternalEventTracking
+action: g_project_management_issue_comment_removed
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: plan
+product_group: project_management
+milestone: "16.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131847
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/g_project_management_issue_cross_referenced.yml b/config/events/g_project_management_issue_cross_referenced.yml
new file mode 100644
index 00000000000..696e25b5c96
--- /dev/null
+++ b/config/events/g_project_management_issue_cross_referenced.yml
@@ -0,0 +1,25 @@
+---
+description: An issue was referenced from somewhere else
+category: InternalEventTracking
+action: g_project_management_issue_cross_referenced
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: plan
+product_group: project_management
+milestone: "16.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131847
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/g_project_management_issue_description_changed.yml b/config/events/g_project_management_issue_description_changed.yml
new file mode 100644
index 00000000000..dc0a4d5f48d
--- /dev/null
+++ b/config/events/g_project_management_issue_description_changed.yml
@@ -0,0 +1,25 @@
+---
+description: Description of an issue changed
+category: InternalEventTracking
+action: g_project_management_issue_description_changed
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: plan
+product_group: project_management
+milestone: "16.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131847
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/g_project_management_issue_design_comments_removed.yml b/config/events/g_project_management_issue_design_comments_removed.yml
new file mode 100644
index 00000000000..22cfbc22f0b
--- /dev/null
+++ b/config/events/g_project_management_issue_design_comments_removed.yml
@@ -0,0 +1,25 @@
+---
+description: A comment on a design was removed
+category: InternalEventTracking
+action: g_project_management_issue_design_comments_removed
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: plan
+product_group: product_planning
+milestone: "16.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131847
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/g_project_management_issue_designs_added.yml b/config/events/g_project_management_issue_designs_added.yml
new file mode 100644
index 00000000000..8d8e26d2796
--- /dev/null
+++ b/config/events/g_project_management_issue_designs_added.yml
@@ -0,0 +1,25 @@
+---
+description: A design was added to an issue
+category: InternalEventTracking
+action: g_project_management_issue_designs_added
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: plan
+product_group: project_management
+milestone: "16.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131847
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/g_project_management_issue_designs_modified.yml b/config/events/g_project_management_issue_designs_modified.yml
new file mode 100644
index 00000000000..bb3423d21ac
--- /dev/null
+++ b/config/events/g_project_management_issue_designs_modified.yml
@@ -0,0 +1,25 @@
+---
+description: A design was modified on an issue
+category: InternalEventTracking
+action: g_project_management_issue_designs_modified
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: plan
+product_group: project_management
+milestone: "16.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131847
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/g_project_management_issue_designs_removed.yml b/config/events/g_project_management_issue_designs_removed.yml
new file mode 100644
index 00000000000..b6416637132
--- /dev/null
+++ b/config/events/g_project_management_issue_designs_removed.yml
@@ -0,0 +1,25 @@
+---
+description: A design wes removed from an issue
+category: InternalEventTracking
+action: g_project_management_issue_designs_removed
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: plan
+product_group: project_management
+milestone: "16.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131847
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/g_project_management_issue_due_date_changed.yml b/config/events/g_project_management_issue_due_date_changed.yml
new file mode 100644
index 00000000000..140a4d62a10
--- /dev/null
+++ b/config/events/g_project_management_issue_due_date_changed.yml
@@ -0,0 +1,25 @@
+---
+description: An issue's due date was changed
+category: InternalEventTracking
+action: g_project_management_issue_due_date_changed
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: plan
+product_group: project_management
+milestone: "16.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131847
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/g_project_management_issue_label_changed.yml b/config/events/g_project_management_issue_label_changed.yml
new file mode 100644
index 00000000000..1d99f46fb87
--- /dev/null
+++ b/config/events/g_project_management_issue_label_changed.yml
@@ -0,0 +1,25 @@
+---
+description: Label was changed on an issue
+category: InternalEventTracking
+action: g_project_management_issue_label_changed
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: plan
+product_group: project_management
+milestone: "16.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131847
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/g_project_management_issue_locked.yml b/config/events/g_project_management_issue_locked.yml
new file mode 100644
index 00000000000..67e92907816
--- /dev/null
+++ b/config/events/g_project_management_issue_locked.yml
@@ -0,0 +1,25 @@
+---
+description: A issue was locked
+category: InternalEventTracking
+action: g_project_management_issue_locked
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: plan
+product_group: project_management
+milestone: "16.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131847
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/g_project_management_issue_made_confidential.yml b/config/events/g_project_management_issue_made_confidential.yml
new file mode 100644
index 00000000000..e4bd84a69d7
--- /dev/null
+++ b/config/events/g_project_management_issue_made_confidential.yml
@@ -0,0 +1,25 @@
+---
+description: An issue was made confidential
+category: InternalEventTracking
+action: g_project_management_issue_made_confidential
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: plan
+product_group: project_management
+milestone: "16.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131847
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/g_project_management_issue_made_visible.yml b/config/events/g_project_management_issue_made_visible.yml
new file mode 100644
index 00000000000..682cf4670bb
--- /dev/null
+++ b/config/events/g_project_management_issue_made_visible.yml
@@ -0,0 +1,25 @@
+---
+description: An issue was made visible
+category: InternalEventTracking
+action: g_project_management_issue_made_visible
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: plan
+product_group: project_management
+milestone: "16.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131847
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/g_project_management_issue_marked_as_duplicate.yml b/config/events/g_project_management_issue_marked_as_duplicate.yml
new file mode 100644
index 00000000000..81417d68f4b
--- /dev/null
+++ b/config/events/g_project_management_issue_marked_as_duplicate.yml
@@ -0,0 +1,25 @@
+---
+description: A issue was marked as a duplicate
+category: InternalEventTracking
+action: g_project_management_issue_marked_as_duplicate
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: plan
+product_group: project_management
+milestone: "16.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131847
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/g_project_management_issue_milestone_changed.yml b/config/events/g_project_management_issue_milestone_changed.yml
new file mode 100644
index 00000000000..9c7fa8749f8
--- /dev/null
+++ b/config/events/g_project_management_issue_milestone_changed.yml
@@ -0,0 +1,25 @@
+---
+description: Milestone changed on an issue
+category: InternalEventTracking
+action: g_project_management_issue_milestone_changed
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: plan
+product_group: project_management
+milestone: "16.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131847
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/g_project_management_issue_moved.yml b/config/events/g_project_management_issue_moved.yml
new file mode 100644
index 00000000000..f07d80fc273
--- /dev/null
+++ b/config/events/g_project_management_issue_moved.yml
@@ -0,0 +1,25 @@
+---
+description: An issue was moved to another project
+category: InternalEventTracking
+action: g_project_management_issue_moved
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: plan
+product_group: project_management
+milestone: "16.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131847
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/g_project_management_issue_related.yml b/config/events/g_project_management_issue_related.yml
new file mode 100644
index 00000000000..89ddef2e229
--- /dev/null
+++ b/config/events/g_project_management_issue_related.yml
@@ -0,0 +1,25 @@
+---
+description: An issue was marked as related to another issue
+category: InternalEventTracking
+action: g_project_management_issue_related
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: plan
+product_group: project_management
+milestone: "16.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131847
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/g_project_management_issue_reopened.yml b/config/events/g_project_management_issue_reopened.yml
new file mode 100644
index 00000000000..ce5d3f23046
--- /dev/null
+++ b/config/events/g_project_management_issue_reopened.yml
@@ -0,0 +1,25 @@
+---
+description: An issue was reopened
+category: InternalEventTracking
+action: g_project_management_issue_reopened
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: plan
+product_group: project_management
+milestone: "16.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131847
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/g_project_management_issue_time_estimate_changed.yml b/config/events/g_project_management_issue_time_estimate_changed.yml
new file mode 100644
index 00000000000..f90254faa63
--- /dev/null
+++ b/config/events/g_project_management_issue_time_estimate_changed.yml
@@ -0,0 +1,25 @@
+---
+description: An issue's time estimate was changed
+category: InternalEventTracking
+action: g_project_management_issue_time_estimate_changed
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: plan
+product_group: project_management
+milestone: "16.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131847
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/g_project_management_issue_time_spent_changed.yml b/config/events/g_project_management_issue_time_spent_changed.yml
new file mode 100644
index 00000000000..9a8b9d8dd1e
--- /dev/null
+++ b/config/events/g_project_management_issue_time_spent_changed.yml
@@ -0,0 +1,25 @@
+---
+description: An issue's time spent was changed
+category: InternalEventTracking
+action: g_project_management_issue_time_spent_changed
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: plan
+product_group: project_management
+milestone: "16.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131847
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/g_project_management_issue_title_changed.yml b/config/events/g_project_management_issue_title_changed.yml
new file mode 100644
index 00000000000..c071ccf2100
--- /dev/null
+++ b/config/events/g_project_management_issue_title_changed.yml
@@ -0,0 +1,25 @@
+---
+description: Title of an issue changed
+category: InternalEventTracking
+action: g_project_management_issue_title_changed
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: plan
+product_group: project_management
+milestone: "16.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131847
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/g_project_management_issue_unlocked.yml b/config/events/g_project_management_issue_unlocked.yml
new file mode 100644
index 00000000000..7d3b35e0ea2
--- /dev/null
+++ b/config/events/g_project_management_issue_unlocked.yml
@@ -0,0 +1,25 @@
+---
+description: An issue was unlocked
+category: InternalEventTracking
+action: g_project_management_issue_unlocked
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: plan
+product_group: project_management
+milestone: "16.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131847
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/g_project_management_issue_unrelated.yml b/config/events/g_project_management_issue_unrelated.yml
new file mode 100644
index 00000000000..369e6c9df07
--- /dev/null
+++ b/config/events/g_project_management_issue_unrelated.yml
@@ -0,0 +1,25 @@
+---
+description: An issue was unrelated to another issue
+category: InternalEventTracking
+action: g_project_management_issue_unrelated
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: plan
+product_group: project_management
+milestone: "16.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131847
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
+
diff --git a/config/events/i_code_review_saved_replies_create.yml b/config/events/i_code_review_saved_replies_create.yml
new file mode 100644
index 00000000000..60295c59df6
--- /dev/null
+++ b/config/events/i_code_review_saved_replies_create.yml
@@ -0,0 +1,24 @@
+---
+description: A saved reply was created
+category: InternalEventTracking
+action: i_code_review_saved_replies_create
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: create
+product_group: code_review
+milestone: "16.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132754
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/i_code_review_saved_replies_use.yml b/config/events/i_code_review_saved_replies_use.yml
new file mode 100644
index 00000000000..2c565d69484
--- /dev/null
+++ b/config/events/i_code_review_saved_replies_use.yml
@@ -0,0 +1,24 @@
+---
+description: A saved reply was used
+category: InternalEventTracking
+action: i_code_review_saved_replies_use
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: create
+product_group: code_review
+milestone: "16.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132754
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/i_code_review_saved_replies_use_in_mr.yml b/config/events/i_code_review_saved_replies_use_in_mr.yml
new file mode 100644
index 00000000000..6bcf436a6a4
--- /dev/null
+++ b/config/events/i_code_review_saved_replies_use_in_mr.yml
@@ -0,0 +1,24 @@
+---
+description: A saved reply was used in an MR
+category: InternalEventTracking
+action: i_code_review_saved_replies_use_in_mr
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: create
+product_group: code_review
+milestone: "16.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132754
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/i_code_review_saved_replies_use_in_other.yml b/config/events/i_code_review_saved_replies_use_in_other.yml
new file mode 100644
index 00000000000..2b426ee9f98
--- /dev/null
+++ b/config/events/i_code_review_saved_replies_use_in_other.yml
@@ -0,0 +1,24 @@
+---
+description: A saved reply was used outside of a merge request
+category: InternalEventTracking
+action: i_code_review_saved_replies_use_in_other
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: dev
+product_stage: create
+product_group: code_review
+milestone: "16.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132754
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/feature_categories.yml b/config/feature_categories.yml
index 8c436313e5f..5ac22ca085e 100644
--- a/config/feature_categories.yml
+++ b/config/feature_categories.yml
@@ -7,6 +7,8 @@
# PLEASE DO NOT EDIT THIS FILE MANUALLY.
#
---
+- acquisition
+- activation
- advisory_database
- ai_abstraction_layer
- ai_evaluation
@@ -58,10 +60,6 @@
- environment_management
- error_budgets
- error_tracking
-- experimentation_activation
-- experimentation_adoption
-- experimentation_conversion
-- experimentation_expansion
- feature_flags
- five_minute_production_app
- fulfillment_admin_tooling
@@ -81,7 +79,6 @@
- insider_threat
- instance_resiliency
- integrations
-- interactive_application_security_testing
- internationalization
- logging
- measurement_and_locking
@@ -120,7 +117,6 @@
- seat_cost_management
- secret_detection
- secrets_management
-- security_benchmarking
- security_policy_management
- service_desk
- service_ping
diff --git a/config/feature_flags/development/use_primary_store_as_default_for_queues_metadata.yml b/config/feature_flags/development/activity_filter_has_mr.yml
index 5c79998fd6a..235e8b559b5 100644
--- a/config/feature_flags/development/use_primary_store_as_default_for_queues_metadata.yml
+++ b/config/feature_flags/development/activity_filter_has_mr.yml
@@ -1,8 +1,8 @@
---
-name: use_primary_store_as_default_for_queues_metadata
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131736
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/425508
+name: activity_filter_has_mr
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132575
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/426104
milestone: '16.5'
type: development
-group: group::scalability
+group: group::threat insights
default_enabled: false
diff --git a/config/feature_flags/development/use_primary_and_secondary_stores_for_queues_metadata.yml b/config/feature_flags/development/additional_merge_when_checks_ready.yml
index abbeb5fcf57..3eeff2f39a2 100644
--- a/config/feature_flags/development/use_primary_and_secondary_stores_for_queues_metadata.yml
+++ b/config/feature_flags/development/additional_merge_when_checks_ready.yml
@@ -1,8 +1,8 @@
---
-name: use_primary_and_secondary_stores_for_queues_metadata
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131736
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/425508
+name: additional_merge_when_checks_ready
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128359
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/424784
milestone: '16.5'
type: development
-group: group::scalability
+group: group::code review
default_enabled: false
diff --git a/config/feature_flags/development/adherence_report_ui.yml b/config/feature_flags/development/adherence_report_ui.yml
index 5648299c689..7db4fbb756f 100644
--- a/config/feature_flags/development/adherence_report_ui.yml
+++ b/config/feature_flags/development/adherence_report_ui.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/414495
milestone: '16.1'
type: development
group: group::compliance
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/api_keyset_pagination_multi_order.yml b/config/feature_flags/development/admin_group_member.yml
index 6fa174e9814..c6267dd3fe3 100644
--- a/config/feature_flags/development/api_keyset_pagination_multi_order.yml
+++ b/config/feature_flags/development/admin_group_member.yml
@@ -1,7 +1,7 @@
---
-name: api_keyset_pagination_multi_order
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/130019
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/422999
+name: admin_group_member
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131914
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/426580
milestone: '16.5'
type: development
group: group::authentication and authorization
diff --git a/config/feature_flags/development/ai_experimentation_api.yml b/config/feature_flags/development/ai_experimentation_api.yml
index 29a9fe4a181..f6ec1c637d0 100644
--- a/config/feature_flags/development/ai_experimentation_api.yml
+++ b/config/feature_flags/development/ai_experimentation_api.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117369
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/406754
milestone: '15.11'
type: development
-group: group::ai-enablement
+group: group::ai framework
default_enabled: false
diff --git a/config/feature_flags/development/optimize_routable.yml b/config/feature_flags/development/ai_self_discover.yml
index 1191d389fa2..ef5e2bc8926 100644
--- a/config/feature_flags/development/optimize_routable.yml
+++ b/config/feature_flags/development/ai_self_discover.yml
@@ -1,8 +1,8 @@
---
-name: optimize_routable
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/130842
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/424138
+name: ai_self_discover
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132267
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/425908
milestone: '16.4'
type: development
-group: group::tenant scale
+group: group::ai framework
default_enabled: false
diff --git a/config/feature_flags/development/arkose_labs_prevent_login.yml b/config/feature_flags/development/arkose_labs_prevent_login.yml
deleted file mode 100644
index 8d55fd6de3a..00000000000
--- a/config/feature_flags/development/arkose_labs_prevent_login.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: arkose_labs_prevent_login
-introduced_by_url:
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/358838
-milestone: '14.10'
-type: development
-group: group::antiabuse
-default_enabled: false
diff --git a/config/feature_flags/development/batch_delay_jira_branch_sync_worker.yml b/config/feature_flags/development/batch_delay_jira_branch_sync_worker.yml
deleted file mode 100644
index 171af0a1690..00000000000
--- a/config/feature_flags/development/batch_delay_jira_branch_sync_worker.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: batch_delay_jira_branch_sync_worker
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/120866
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/411865
-milestone: '16.1'
-type: development
-group: group::source code
-default_enabled: true
diff --git a/config/feature_flags/development/bulk_add_on_assignment_refresh_worker.yml b/config/feature_flags/development/bulk_add_on_assignment_refresh_worker.yml
new file mode 100644
index 00000000000..b87026cb2df
--- /dev/null
+++ b/config/feature_flags/development/bulk_add_on_assignment_refresh_worker.yml
@@ -0,0 +1,8 @@
+---
+name: bulk_add_on_assignment_refresh_worker
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/134223
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/428258
+milestone: '16.5'
+type: development
+group: group::purchase
+default_enabled: false
diff --git a/config/feature_flags/development/bulk_import_idempotent_workers.yml b/config/feature_flags/development/bulk_import_idempotent_workers.yml
new file mode 100644
index 00000000000..83d5b7f65c7
--- /dev/null
+++ b/config/feature_flags/development/bulk_import_idempotent_workers.yml
@@ -0,0 +1,8 @@
+---
+name: bulk_import_idempotent_workers
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132702
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/426480
+milestone: '16.5'
+type: development
+group: group::import and integrate
+default_enabled: false
diff --git a/config/feature_flags/development/search_milestones_hide_archived_projects.yml b/config/feature_flags/development/cache_autocomplete_sources_members.yml
index 859a92e5dec..c80a7490031 100644
--- a/config/feature_flags/development/search_milestones_hide_archived_projects.yml
+++ b/config/feature_flags/development/cache_autocomplete_sources_members.yml
@@ -1,9 +1,8 @@
---
-name: search_milestones_hide_archived_projects
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/130937
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/424256
-milestone: '16.4'
+name: cache_autocomplete_sources_members
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/133454
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/427452
+milestone: '16.5'
type: development
group: group::global search
default_enabled: false
-
diff --git a/config/feature_flags/development/chatops.yml b/config/feature_flags/development/chatops.yml
deleted file mode 100644
index 74cabe995e5..00000000000
--- a/config/feature_flags/development/chatops.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: chatops
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/24780
-rollout_issue_url:
-milestone: '11.9'
-type: development
-group: group::configure
-default_enabled: true
diff --git a/config/feature_flags/development/check_membership_in_protected_ref_access.yml b/config/feature_flags/development/check_membership_in_protected_ref_access.yml
new file mode 100644
index 00000000000..87e3fc9fcaf
--- /dev/null
+++ b/config/feature_flags/development/check_membership_in_protected_ref_access.yml
@@ -0,0 +1,8 @@
+---
+name: check_membership_in_protected_ref_access
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132380
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/425926
+milestone: '16.5'
+type: development
+group: group::source code
+default_enabled: false
diff --git a/config/feature_flags/development/check_path_traversal_middleware.yml b/config/feature_flags/development/check_path_traversal_middleware.yml
new file mode 100644
index 00000000000..e8a4a39f0ea
--- /dev/null
+++ b/config/feature_flags/development/check_path_traversal_middleware.yml
@@ -0,0 +1,8 @@
+---
+name: check_path_traversal_middleware
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/123477
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/415460
+milestone: '16.5'
+type: development
+group: group::package registry
+default_enabled: false
diff --git a/config/feature_flags/development/ci_fix_performance_pipelines_json_endpoint.yml b/config/feature_flags/development/ci_fix_performance_pipelines_json_endpoint.yml
new file mode 100644
index 00000000000..069d0349181
--- /dev/null
+++ b/config/feature_flags/development/ci_fix_performance_pipelines_json_endpoint.yml
@@ -0,0 +1,8 @@
+---
+name: ci_fix_performance_pipelines_json_endpoint
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132990
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/427255
+milestone: '16.5'
+type: development
+group: group::pipeline authoring
+default_enabled: false
diff --git a/config/feature_flags/development/enable_hamilton_in_usage_quotas_ui.yml b/config/feature_flags/development/code_suggestions_user_assignments.yml
index 3d5c3a4e574..d37ea80140a 100644
--- a/config/feature_flags/development/enable_hamilton_in_usage_quotas_ui.yml
+++ b/config/feature_flags/development/code_suggestions_user_assignments.yml
@@ -1,8 +1,8 @@
---
-name: enable_hamilton_in_usage_quotas_ui
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/123480
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/411855
-milestone: '16.1'
+name: code_suggestions_user_assignments
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/134034
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/428574
+milestone: '16.5'
type: development
group: group::purchase
default_enabled: false
diff --git a/config/feature_flags/development/compliance_adherence_report.yml b/config/feature_flags/development/compliance_adherence_report.yml
index b4a19625a5d..f67ff7bdec3 100644
--- a/config/feature_flags/development/compliance_adherence_report.yml
+++ b/config/feature_flags/development/compliance_adherence_report.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/416988
milestone: '16.2'
type: development
group: group::compliance
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/compliance_framework_report_ui.yml b/config/feature_flags/development/compliance_framework_report_ui.yml
new file mode 100644
index 00000000000..a70869bfeed
--- /dev/null
+++ b/config/feature_flags/development/compliance_framework_report_ui.yml
@@ -0,0 +1,8 @@
+---
+name: compliance_framework_report_ui
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131838
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/425242
+milestone: '16.5'
+type: development
+group: group::compliance
+default_enabled: false
diff --git a/config/feature_flags/development/composer_use_ssh_source_urls.yml b/config/feature_flags/development/composer_use_ssh_source_urls.yml
index 26111623ea3..d74dcdf9806 100644
--- a/config/feature_flags/development/composer_use_ssh_source_urls.yml
+++ b/config/feature_flags/development/composer_use_ssh_source_urls.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/422171
milestone: '16.4'
type: development
group: group::package registry
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/content_editor_on_issues.yml b/config/feature_flags/development/content_editor_on_issues.yml
deleted file mode 100644
index 79aaccee828..00000000000
--- a/config/feature_flags/development/content_editor_on_issues.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: content_editor_on_issues
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/98703
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/375172
-milestone: '15.5'
-type: development
-group: group::knowledge
-default_enabled: true
diff --git a/config/feature_flags/development/coop_header.yml b/config/feature_flags/development/coop_header.yml
new file mode 100644
index 00000000000..9166f4c6819
--- /dev/null
+++ b/config/feature_flags/development/coop_header.yml
@@ -0,0 +1,8 @@
+---
+name: coop_header
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131571
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/425701
+milestone: '16.5'
+type: development
+group: group::authentication and authorization
+default_enabled: false
diff --git a/config/feature_flags/development/create_deployment_only_for_processable_jobs.yml b/config/feature_flags/development/create_deployment_only_for_processable_jobs.yml
new file mode 100644
index 00000000000..f721dd8265c
--- /dev/null
+++ b/config/feature_flags/development/create_deployment_only_for_processable_jobs.yml
@@ -0,0 +1,8 @@
+---
+name: create_deployment_only_for_processable_jobs
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132835
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/427062
+milestone: '16.5'
+type: development
+group: group::environments
+default_enabled: false
diff --git a/config/feature_flags/development/create_vulnerability_jira_issue_via_graphql.yml b/config/feature_flags/development/create_vulnerability_jira_issue_via_graphql.yml
index 9aa5807789d..8402dda09b2 100644
--- a/config/feature_flags/development/create_vulnerability_jira_issue_via_graphql.yml
+++ b/config/feature_flags/development/create_vulnerability_jira_issue_via_graphql.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60593
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/329780
milestone: '13.12'
type: development
-group: group::protect
+group: group::threat insights
default_enabled: false
diff --git a/config/feature_flags/development/database_analyze_on_partitioned_tables.yml b/config/feature_flags/development/database_analyze_on_partitioned_tables.yml
deleted file mode 100644
index 1d11d3dade3..00000000000
--- a/config/feature_flags/development/database_analyze_on_partitioned_tables.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: database_analyze_on_partitioned_tables
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/130599
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/423959
-milestone: '16.4'
-type: development
-group: group::database
-default_enabled: false
diff --git a/config/feature_flags/development/deploy_key_for_protected_tags.yml b/config/feature_flags/development/deploy_key_for_protected_tags.yml
deleted file mode 100644
index fe89c889a5e..00000000000
--- a/config/feature_flags/development/deploy_key_for_protected_tags.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: deploy_key_for_protected_tags
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110238
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/389237
-milestone: '15.9'
-type: development
-group: group::source code
-default_enabled: true
diff --git a/config/feature_flags/development/enable_environments_search_within_folder.yml b/config/feature_flags/development/enable_environments_search_within_folder.yml
index 18edc467293..3038a38040c 100644
--- a/config/feature_flags/development/enable_environments_search_within_folder.yml
+++ b/config/feature_flags/development/enable_environments_search_within_folder.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102227/
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382108
milestone: '15.7'
type: development
-group: group::configure
+group: group::environments
default_enabled: true
diff --git a/config/feature_flags/development/enable_exclusive_lease_double_lock_rw.yml b/config/feature_flags/development/enable_exclusive_lease_double_lock_rw.yml
deleted file mode 100644
index 1c735e32317..00000000000
--- a/config/feature_flags/development/enable_exclusive_lease_double_lock_rw.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: enable_exclusive_lease_double_lock_rw
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128083
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/421156
-milestone: '16.3'
-type: development
-group: group::scalability
-default_enabled: false
diff --git a/config/feature_flags/development/errors_utf_8_encoding.yml b/config/feature_flags/development/enforce_ssh_certificates.yml
index 50ecd0ad664..beaa6c02869 100644
--- a/config/feature_flags/development/errors_utf_8_encoding.yml
+++ b/config/feature_flags/development/enforce_ssh_certificates.yml
@@ -1,8 +1,8 @@
---
-name: errors_utf_8_encoding
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/129217
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/422061
-milestone: '16.4'
+name: enforce_ssh_certificates
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132653
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/426235
+milestone: '16.5'
type: development
group: group::source code
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/explain_code_snippet.yml b/config/feature_flags/development/explain_code_snippet.yml
deleted file mode 100644
index 13a098e41e0..00000000000
--- a/config/feature_flags/development/explain_code_snippet.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: explain_code_snippet
-introduced_by_url:
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/404631
-milestone: '15.11'
-type: development
-group: group::source code
-default_enabled: false
diff --git a/config/feature_flags/development/export_csv_preload_in_batches.yml b/config/feature_flags/development/export_csv_preload_in_batches.yml
index 60c82dce4a0..f745bba537e 100644
--- a/config/feature_flags/development/export_csv_preload_in_batches.yml
+++ b/config/feature_flags/development/export_csv_preload_in_batches.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85989
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/389847
milestone: '15.9'
type: development
-group: group::import
+group: group::import and integrate
default_enabled: false
diff --git a/config/feature_flags/development/fast_forward_merge_trains_support.yml b/config/feature_flags/development/fast_forward_merge_trains_support.yml
index 0e951c42680..9c814bb658e 100644
--- a/config/feature_flags/development/fast_forward_merge_trains_support.yml
+++ b/config/feature_flags/development/fast_forward_merge_trains_support.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/282442
milestone: '16.1'
type: development
group: group::pipeline execution
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/fetch_commits_for_bitbucket_server.yml b/config/feature_flags/development/fetch_commits_for_bitbucket_server.yml
new file mode 100644
index 00000000000..5524b0bf4d7
--- /dev/null
+++ b/config/feature_flags/development/fetch_commits_for_bitbucket_server.yml
@@ -0,0 +1,8 @@
+---
+name: fetch_commits_for_bitbucket_server
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/133606
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/427699
+milestone: '16.5'
+type: development
+group: group::import and integrate
+default_enabled: false
diff --git a/config/feature_flags/development/force_autodevops_on_by_default.yml b/config/feature_flags/development/force_autodevops_on_by_default.yml
index a2430dc1c27..ab64ccb5e19 100644
--- a/config/feature_flags/development/force_autodevops_on_by_default.yml
+++ b/config/feature_flags/development/force_autodevops_on_by_default.yml
@@ -1,8 +1,8 @@
---
name: force_autodevops_on_by_default
introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/21136
-rollout_issue_url:
+rollout_issue_url:
milestone: '11.3'
type: development
-group: group::configure
+group: group::environments
default_enabled: false
diff --git a/config/feature_flags/development/geo_pipeline_artifact_replication.yml b/config/feature_flags/development/geo_pipeline_artifact_replication.yml
deleted file mode 100644
index 9d5bbf60401..00000000000
--- a/config/feature_flags/development/geo_pipeline_artifact_replication.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: geo_pipeline_artifact_replication
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57741
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326228
-milestone: '13.11'
-type: development
-group: group::geo
-default_enabled: true
diff --git a/config/feature_flags/development/geo_snippet_repository_replication.yml b/config/feature_flags/development/geo_snippet_repository_replication.yml
deleted file mode 100644
index 5815c9a1f6d..00000000000
--- a/config/feature_flags/development/geo_snippet_repository_replication.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: geo_snippet_repository_replication
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38688
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/224168
-milestone: '13.4'
-type: development
-group: group::geo
-default_enabled: true
diff --git a/config/feature_flags/development/gl_analytics_tracking.yml b/config/feature_flags/development/gl_analytics_tracking.yml
new file mode 100644
index 00000000000..3a67aa05812
--- /dev/null
+++ b/config/feature_flags/development/gl_analytics_tracking.yml
@@ -0,0 +1,8 @@
+---
+name: gl_analytics_tracking
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132534
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/426106
+milestone: '16.5'
+type: development
+group: group::analytics instrumentation
+default_enabled: false
diff --git a/config/feature_flags/development/arkose_labs_login_challenge.yml b/config/feature_flags/development/hide_snippets_of_banned_users.yml
index 74c5d625aa3..54ff92a5142 100644
--- a/config/feature_flags/development/arkose_labs_login_challenge.yml
+++ b/config/feature_flags/development/hide_snippets_of_banned_users.yml
@@ -1,8 +1,8 @@
---
-name: arkose_labs_login_challenge
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82751
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356171
-milestone: '14.10'
+name: hide_snippets_of_banned_users
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/134048
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/425391
+milestone: '16.6'
type: development
-group: group::antiabuse
-default_enabled: false
+group: group::anti-abuse
+default_enabled: false \ No newline at end of file
diff --git a/config/feature_flags/development/deactivation_email_additional_text.yml b/config/feature_flags/development/inherit_higher_access_levels_no_cross_join.yml
index a603d4cd77e..b4cef5219ba 100644
--- a/config/feature_flags/development/deactivation_email_additional_text.yml
+++ b/config/feature_flags/development/inherit_higher_access_levels_no_cross_join.yml
@@ -1,8 +1,8 @@
---
-name: deactivation_email_additional_text
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110033
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/389538
-milestone: '15.9'
+name: inherit_higher_access_levels_no_cross_join
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132947
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/427238
+milestone: '16.5'
type: development
group: group::authentication and authorization
default_enabled: true
diff --git a/config/feature_flags/development/invalid_graphql_auth_401.yml b/config/feature_flags/development/invalid_graphql_auth_401.yml
new file mode 100644
index 00000000000..668a86cc52f
--- /dev/null
+++ b/config/feature_flags/development/invalid_graphql_auth_401.yml
@@ -0,0 +1,8 @@
+---
+name: invalid_graphql_auth_401
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132149
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/426196
+milestone: '16.5'
+type: development
+group: group::import and integrate
+default_enabled: false
diff --git a/config/feature_flags/development/issue_assignees_widget.yml b/config/feature_flags/development/issue_assignees_widget.yml
index 5c9b7df941f..5163a345a3b 100644
--- a/config/feature_flags/development/issue_assignees_widget.yml
+++ b/config/feature_flags/development/issue_assignees_widget.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/328185
milestone: '13.11'
type: development
group: group::project management
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/jwt_auth_space_delimited_scopes.yml b/config/feature_flags/development/jwt_auth_space_delimited_scopes.yml
new file mode 100644
index 00000000000..cddeb60c4ab
--- /dev/null
+++ b/config/feature_flags/development/jwt_auth_space_delimited_scopes.yml
@@ -0,0 +1,8 @@
+---
+name: jwt_auth_space_delimited_scopes
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/133841
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/427881
+milestone: '16.5'
+type: development
+group: group::container registry
+default_enabled: false
diff --git a/config/feature_flags/development/k8s_proxy_pat.yml b/config/feature_flags/development/k8s_proxy_pat.yml
deleted file mode 100644
index ef9101b9354..00000000000
--- a/config/feature_flags/development/k8s_proxy_pat.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: k8s_proxy_pat
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/129661
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/422961
-milestone: '16.4'
-type: development
-group: group::environments
-default_enabled: true
diff --git a/config/feature_flags/development/lfs_batch_direct_downloads.yml b/config/feature_flags/development/lfs_batch_direct_downloads.yml
deleted file mode 100644
index 33fe2a55b23..00000000000
--- a/config/feature_flags/development/lfs_batch_direct_downloads.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: lfs_batch_direct_downloads
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/122221
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/421692
-milestone: '16.1'
-type: development
-group: group::source code
-default_enabled: true
diff --git a/config/feature_flags/development/log_execution_time_path_traversal_middleware.yml b/config/feature_flags/development/log_execution_time_path_traversal_middleware.yml
new file mode 100644
index 00000000000..18d64568c3d
--- /dev/null
+++ b/config/feature_flags/development/log_execution_time_path_traversal_middleware.yml
@@ -0,0 +1,8 @@
+---
+name: log_execution_time_path_traversal_middleware
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/123477
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/415460
+milestone: '16.5'
+type: development
+group: group::package registry
+default_enabled: false
diff --git a/config/feature_flags/development/loose_foreign_keys_batch_load_using_union.yml b/config/feature_flags/development/loose_foreign_keys_batch_load_using_union.yml
deleted file mode 100644
index 4e4a1e262b0..00000000000
--- a/config/feature_flags/development/loose_foreign_keys_batch_load_using_union.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: loose_foreign_keys_batch_load_using_union
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128759
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/421422
-milestone: '16.3'
-type: development
-group: group::tenant scale
-default_enabled: true
diff --git a/config/feature_flags/development/ai_tool_info.yml b/config/feature_flags/development/manage_project_access_tokens.yml
index 7fb41f05ab7..6a91e1fc140 100644
--- a/config/feature_flags/development/ai_tool_info.yml
+++ b/config/feature_flags/development/manage_project_access_tokens.yml
@@ -1,8 +1,8 @@
---
-name: ai_tool_info
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128501
+name: manage_project_access_tokens
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132342
rollout_issue_url:
-milestone: '16.3'
+milestone: '16.5'
type: development
-group: group::ai framework
+group: group::authentication and authorization
default_enabled: false
diff --git a/config/feature_flags/development/mobile_devops_projects_promo.yml b/config/feature_flags/development/mobile_devops_projects_promo.yml
deleted file mode 100644
index c1fcca28858..00000000000
--- a/config/feature_flags/development/mobile_devops_projects_promo.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: mobile_devops_projects_promo
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/120144
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/410601
-milestone: '16.0'
-type: development
-group: group::mobile devops
-default_enabled: false
diff --git a/config/feature_flags/development/mr_activity_filters.yml b/config/feature_flags/development/mr_activity_filters.yml
deleted file mode 100644
index ae3a193047b..00000000000
--- a/config/feature_flags/development/mr_activity_filters.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: mr_activity_filters
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115383
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/412432
-milestone: '15.11'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/move_close_into_dropdown.yml b/config/feature_flags/development/notifications_todos_buttons.yml
index 65777f09eb7..5dd6a19c49e 100644
--- a/config/feature_flags/development/move_close_into_dropdown.yml
+++ b/config/feature_flags/development/notifications_todos_buttons.yml
@@ -1,8 +1,8 @@
---
-name: move_close_into_dropdown
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/125173
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/416861
-milestone: '16.2'
+name: notifications_todos_buttons
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132678
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/426305
+milestone: '16.5'
type: development
group: group::ux paper cuts
default_enabled: false
diff --git a/config/feature_flags/development/observability_group_tab.yml b/config/feature_flags/development/observability_group_tab.yml
deleted file mode 100644
index 168299c15af..00000000000
--- a/config/feature_flags/development/observability_group_tab.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: observability_group_tab
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96374
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381740
-milestone: '15.3'
-type: development
-group: group::observability
-default_enabled: false
diff --git a/config/feature_flags/development/on_demand_scans_runner_tags.yml b/config/feature_flags/development/on_demand_scans_runner_tags.yml
deleted file mode 100644
index 6141bae2553..00000000000
--- a/config/feature_flags/development/on_demand_scans_runner_tags.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: on_demand_scans_runner_tags
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103634
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381910
-milestone: '15.7'
-type: development
-group: group::dynamic analysis
-default_enabled: true
diff --git a/config/feature_flags/development/openai_experimentation.yml b/config/feature_flags/development/openai_experimentation.yml
index 8f0bb6df036..054e6442445 100644
--- a/config/feature_flags/development/openai_experimentation.yml
+++ b/config/feature_flags/development/openai_experimentation.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/116364
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/403855
milestone: '15.11'
type: development
-group: group::ai-enablement
+group: group::ai framework
default_enabled: false
diff --git a/config/feature_flags/development/optimize_group_template_query.yml b/config/feature_flags/development/optimize_group_template_query.yml
deleted file mode 100644
index 68cd7bb1e03..00000000000
--- a/config/feature_flags/development/optimize_group_template_query.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: optimize_group_template_query
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/129399
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/422390
-milestone: '16.4'
-type: development
-group: group::source code
-default_enabled: true
diff --git a/config/feature_flags/development/packages_protected_packages.yml b/config/feature_flags/development/packages_protected_packages.yml
new file mode 100644
index 00000000000..6e159248e01
--- /dev/null
+++ b/config/feature_flags/development/packages_protected_packages.yml
@@ -0,0 +1,8 @@
+---
+name: packages_protected_packages
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/125915
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/416395
+milestone: '16.5'
+type: development
+group: group::package registry
+default_enabled: false \ No newline at end of file
diff --git a/config/feature_flags/development/generate_description_ai.yml b/config/feature_flags/development/page_specific_styles.yml
index b90594d263d..5ca06e09689 100644
--- a/config/feature_flags/development/generate_description_ai.yml
+++ b/config/feature_flags/development/page_specific_styles.yml
@@ -1,8 +1,8 @@
---
-name: generate_description_ai
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118712
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/409369
-milestone: '16.0'
+name: page_specific_styles
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131606
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/425035
+milestone: '16.5'
type: development
group: group::project management
default_enabled: false
diff --git a/config/feature_flags/development/print_wiki.yml b/config/feature_flags/development/print_wiki.yml
index e04d7dd84bf..75305425deb 100644
--- a/config/feature_flags/development/print_wiki.yml
+++ b/config/feature_flags/development/print_wiki.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/414691
milestone: '16.3'
type: development
group: group::knowledge
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/prohibited_tag_name_encoding_check.yml b/config/feature_flags/development/prohibited_tag_name_encoding_check.yml
new file mode 100644
index 00000000000..98a51b34cc9
--- /dev/null
+++ b/config/feature_flags/development/prohibited_tag_name_encoding_check.yml
@@ -0,0 +1,8 @@
+---
+name: prohibited_tag_name_encoding_check
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132135
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/426013
+milestone: '16.5'
+type: development
+group: group::source code
+default_enabled: false
diff --git a/config/feature_flags/development/project_templates_without_min_access.yml b/config/feature_flags/development/project_templates_without_min_access.yml
new file mode 100644
index 00000000000..5de9ba18191
--- /dev/null
+++ b/config/feature_flags/development/project_templates_without_min_access.yml
@@ -0,0 +1,8 @@
+---
+name: project_templates_without_min_access
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132025
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/425452
+milestone: '16.5'
+type: development
+group: group::source code
+default_enabled: false
diff --git a/config/feature_flags/development/rate_limit_oauth_api.yml b/config/feature_flags/development/rate_limit_oauth_api.yml
new file mode 100644
index 00000000000..67b333420a7
--- /dev/null
+++ b/config/feature_flags/development/rate_limit_oauth_api.yml
@@ -0,0 +1,8 @@
+---
+name: rate_limit_oauth_api
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/133109
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/427874
+milestone: '16.5'
+type: development
+group: group::authentication and authorization
+default_enabled: false
diff --git a/config/feature_flags/development/graphql_job_trace_html_summary_max_size.yml b/config/feature_flags/development/reduced_build_attributes_list_for_rules.yml
index 88e99afddf3..85170fb02ba 100644
--- a/config/feature_flags/development/graphql_job_trace_html_summary_max_size.yml
+++ b/config/feature_flags/development/reduced_build_attributes_list_for_rules.yml
@@ -1,7 +1,8 @@
-name: graphql_job_trace_html_summary_max_size
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/130984
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/425196
+---
+name: reduced_build_attributes_list_for_rules
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132654
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/426259
milestone: '16.5'
-group: group::pipeline execution
type: development
+group: group::pipeline execution
default_enabled: false
diff --git a/config/feature_flags/development/remove_legacy_github_client.yml b/config/feature_flags/development/remove_legacy_github_client.yml
deleted file mode 100644
index 1469a99ab2f..00000000000
--- a/config/feature_flags/development/remove_legacy_github_client.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: remove_legacy_github_client
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37555
-rollout_issue_url:
-milestone: '13.3'
-type: development
-group: group::import
-default_enabled: false
diff --git a/config/feature_flags/development/remove_request_stats_for_tracing.yml b/config/feature_flags/development/remove_request_stats_for_tracing.yml
new file mode 100644
index 00000000000..1c92c652b43
--- /dev/null
+++ b/config/feature_flags/development/remove_request_stats_for_tracing.yml
@@ -0,0 +1,8 @@
+---
+name: remove_request_stats_for_tracing
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/133951
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/428041
+milestone: '16.5'
+type: development
+group: group::code review
+default_enabled: false
diff --git a/config/feature_flags/development/resolve_ambiguous_archives.yml b/config/feature_flags/development/resolve_ambiguous_archives.yml
deleted file mode 100644
index ed4ed492105..00000000000
--- a/config/feature_flags/development/resolve_ambiguous_archives.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: resolve_ambiguous_archives
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/116411
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/403650
-milestone: '15.11'
-type: development
-group: group::source code
-default_enabled: true
diff --git a/config/feature_flags/development/restrict_special_characters_in_namespace_path.yml b/config/feature_flags/development/restrict_special_characters_in_namespace_path.yml
deleted file mode 100644
index c46d56d905a..00000000000
--- a/config/feature_flags/development/restrict_special_characters_in_namespace_path.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: restrict_special_characters_in_namespace_path
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111017
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/390954
-milestone: '15.9'
-type: development
-group: group::tenant scale
-default_enabled: true
diff --git a/config/feature_flags/development/scan_execution_policy_pipelines.yml b/config/feature_flags/development/scan_execution_policy_pipelines.yml
deleted file mode 100644
index b062b9940c3..00000000000
--- a/config/feature_flags/development/scan_execution_policy_pipelines.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: scan_execution_policy_pipelines
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/121087
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/415607
-milestone: '16.1'
-type: development
-group: group::security policies
-default_enabled: true
diff --git a/config/feature_flags/development/server_side_frecent_namespaces.yml b/config/feature_flags/development/server_side_frecent_namespaces.yml
deleted file mode 100644
index d9d4c37789c..00000000000
--- a/config/feature_flags/development/server_side_frecent_namespaces.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: server_side_frecent_namespaces
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/123554
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/417256
-milestone: '16.4'
-type: development
-group: group::foundations
-default_enabled: false
diff --git a/config/feature_flags/development/service_desk_vue_list.yml b/config/feature_flags/development/service_desk_vue_list.yml
index 8cd260289cf..29af75d4442 100644
--- a/config/feature_flags/development/service_desk_vue_list.yml
+++ b/config/feature_flags/development/service_desk_vue_list.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/415385
milestone: '16.1'
type: development
group: group::respond
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/standard_merge_train_ref_merge_commit.yml b/config/feature_flags/development/standard_merge_train_ref_merge_commit.yml
deleted file mode 100644
index a9fba90a264..00000000000
--- a/config/feature_flags/development/standard_merge_train_ref_merge_commit.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: standard_merge_train_ref_merge_commit
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/129820
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/422724
-milestone: '16.4'
-type: development
-group: group::pipeline execution
-default_enabled: true
diff --git a/config/feature_flags/development/summarize_comments.yml b/config/feature_flags/development/summarize_comments.yml
deleted file mode 100644
index e0f8b223895..00000000000
--- a/config/feature_flags/development/summarize_comments.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: summarize_comments
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117296
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/406758
-milestone: '15.11'
-type: development
-group: group::ai-enablement
-default_enabled: false
diff --git a/config/feature_flags/development/use_cluster_shared_state_for_exclusive_lease.yml b/config/feature_flags/development/use_cluster_shared_state_for_exclusive_lease.yml
deleted file mode 100644
index 6ef9e80551a..00000000000
--- a/config/feature_flags/development/use_cluster_shared_state_for_exclusive_lease.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: use_cluster_shared_state_for_exclusive_lease
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128083
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/421156
-milestone: '16.3'
-type: development
-group: group::scalability
-default_enabled: false
diff --git a/config/feature_flags/development/chat_epic_identifier.yml b/config/feature_flags/development/use_embeddings_with_vertex.yml
index f7c0fcecbd7..1f37539b4ff 100644
--- a/config/feature_flags/development/chat_epic_identifier.yml
+++ b/config/feature_flags/development/use_embeddings_with_vertex.yml
@@ -1,8 +1,8 @@
---
-name: chat_epic_identifier
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128487
+name: use_embeddings_with_vertex
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/130421
rollout_issue_url:
-milestone: '16.3'
+milestone: '16.5'
type: development
-group: group::ai framework
+group: group::duo chat
default_enabled: false
diff --git a/config/feature_flags/development/gitlab_duo.yml b/config/feature_flags/development/use_gitlab_http_v2.yml
index 5fce9acf12f..92a3cdddbb9 100644
--- a/config/feature_flags/development/gitlab_duo.yml
+++ b/config/feature_flags/development/use_gitlab_http_v2.yml
@@ -1,8 +1,8 @@
---
-name: gitlab_duo
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/122235
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/413688
-milestone: '16.1'
+name: use_gitlab_http_v2
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132742
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/426549
+milestone: '16.5'
type: development
-group: group::ai-enablement
+group: group::pipeline authoring
default_enabled: false
diff --git a/config/feature_flags/development/use_offset_pagination_for_canceling_redundant_pipelines.yml b/config/feature_flags/development/use_offset_pagination_for_canceling_redundant_pipelines.yml
deleted file mode 100644
index 72475948793..00000000000
--- a/config/feature_flags/development/use_offset_pagination_for_canceling_redundant_pipelines.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: use_offset_pagination_for_canceling_redundant_pipelines
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/122764
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/414459
-milestone: '16.1'
-type: development
-group: group::optimize
-default_enabled: true
diff --git a/config/feature_flags/development/use_primary_and_secondary_stores_for_workhorse.yml b/config/feature_flags/development/use_primary_and_secondary_stores_for_workhorse.yml
deleted file mode 100644
index a5577c5d5d0..00000000000
--- a/config/feature_flags/development/use_primary_and_secondary_stores_for_workhorse.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: use_primary_and_secondary_stores_for_workhorse
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127577
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/423420
-milestone: '16.4'
-type: development
-group: group::scalability
-default_enabled: false
diff --git a/config/feature_flags/development/use_primary_store_as_default_for_workhorse.yml b/config/feature_flags/development/use_primary_store_as_default_for_workhorse.yml
deleted file mode 100644
index e6d21627035..00000000000
--- a/config/feature_flags/development/use_primary_store_as_default_for_workhorse.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: use_primary_store_as_default_for_workhorse
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127577
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/423420
-milestone: '16.4'
-type: development
-group: group::scalability
-default_enabled: false
diff --git a/config/feature_flags/development/use_traversal_ids.yml b/config/feature_flags/development/use_traversal_ids.yml
deleted file mode 100644
index 51f0ba39025..00000000000
--- a/config/feature_flags/development/use_traversal_ids.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: use_traversal_ids
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56296
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321948
-milestone: '13.11'
-type: development
-group: group::tenant scale
-default_enabled: true
diff --git a/config/feature_flags/development/use_traversal_ids_for_self_and_hierarchy_scopes.yml b/config/feature_flags/development/use_traversal_ids_for_self_and_hierarchy_scopes.yml
deleted file mode 100644
index 497184111bd..00000000000
--- a/config/feature_flags/development/use_traversal_ids_for_self_and_hierarchy_scopes.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: use_traversal_ids_for_self_and_hierarchy_scopes
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80045
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/352120
-milestone: '14.8'
-type: development
-group: group::tenant scale
-default_enabled: true
diff --git a/config/feature_flags/development/validate_import_decompressed_archive_size.yml b/config/feature_flags/development/validate_import_decompressed_archive_size.yml
index cd8f7756b13..62f011a8330 100644
--- a/config/feature_flags/development/validate_import_decompressed_archive_size.yml
+++ b/config/feature_flags/development/validate_import_decompressed_archive_size.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39686
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/282245
milestone: '13.4'
type: development
-group: group::import
+group: group::import and integrate
default_enabled: true
diff --git a/config/feature_flags/development/visible_label_selection_on_metadata.yml b/config/feature_flags/development/visible_label_selection_on_metadata.yml
deleted file mode 100644
index bf173b26d44..00000000000
--- a/config/feature_flags/development/visible_label_selection_on_metadata.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: visible_label_selection_on_metadata
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88908
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/364534
-milestone: '16.0'
-type: development
-group: "group::ux paper cuts"
-default_enabled: false
diff --git a/config/feature_flags/development/ai_related_settings.yml b/config/feature_flags/development/vsa_predefined_date_ranges.yml
index 3d4b24c6999..8ef46db72bd 100644
--- a/config/feature_flags/development/ai_related_settings.yml
+++ b/config/feature_flags/development/vsa_predefined_date_ranges.yml
@@ -1,8 +1,8 @@
---
-name: ai_related_settings
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118222
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/408791
-milestone: '16.0'
+name: vsa_predefined_date_ranges
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131825
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/425317
+milestone: '16.5'
type: development
-group: group::ai-enablement
+group: group::optimize
default_enabled: false
diff --git a/config/feature_flags/development/vulnerability_report_grouping.yml b/config/feature_flags/development/vulnerability_report_grouping.yml
index f5c445a3518..fc7312cc147 100644
--- a/config/feature_flags/development/vulnerability_report_grouping.yml
+++ b/config/feature_flags/development/vulnerability_report_grouping.yml
@@ -2,7 +2,7 @@
name: vulnerability_report_grouping
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/129709
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/422509
-milestone: '16.4'
+milestone: '16.5'
type: development
group: group::threat insights
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/experiment/build_ios_app_guide_email.yml b/config/feature_flags/experiment/build_ios_app_guide_email.yml
deleted file mode 100644
index 4e90b036063..00000000000
--- a/config/feature_flags/experiment/build_ios_app_guide_email.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: build_ios_app_guide_email
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83817
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/357803
-milestone: '15.0'
-type: experiment
-group: group::activation
-default_enabled: false
diff --git a/config/feature_flags/experiment/in_product_guidance_environments_webide.yml b/config/feature_flags/experiment/in_product_guidance_environments_webide.yml
index 732294f7d96..167a70747a0 100644
--- a/config/feature_flags/experiment/in_product_guidance_environments_webide.yml
+++ b/config/feature_flags/experiment/in_product_guidance_environments_webide.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57160
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330390
milestone: '13.12'
type: experiment
-group: group::release
+group: group::environments
default_enabled: false
diff --git a/config/feature_flags/ops/additional_snowplow_tracking.yml b/config/feature_flags/ops/additional_snowplow_tracking.yml
index 4dbf91bbff5..84db2e9af38 100644
--- a/config/feature_flags/ops/additional_snowplow_tracking.yml
+++ b/config/feature_flags/ops/additional_snowplow_tracking.yml
@@ -3,6 +3,6 @@ name: additional_snowplow_tracking
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/12088
rollout_issue_url:
milestone: '11.11'
-group: group::product intelligence
+group: group::analytics instrumentation
default_enabled: false
type: ops
diff --git a/config/feature_flags/ops/auto_disabling_web_hooks.yml b/config/feature_flags/ops/auto_disabling_web_hooks.yml
index 2eebdd3d1d9..35a303ed411 100644
--- a/config/feature_flags/ops/auto_disabling_web_hooks.yml
+++ b/config/feature_flags/ops/auto_disabling_web_hooks.yml
@@ -4,6 +4,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113479
rollout_issue_url:
milestone: '15.10'
type: ops
-group: group::integrations
+group: group::import and integrate
default_enabled: false # Keep this value as false, as feature should be disabled by default for self-managed
# https://gitlab.com/gitlab-org/gitlab/-/issues/390157.
diff --git a/config/feature_flags/ops/bitbucket_server_user_mapping_by_username.yml b/config/feature_flags/ops/bitbucket_server_user_mapping_by_username.yml
index 9d86b4f5af4..e9fe13bb659 100644
--- a/config/feature_flags/ops/bitbucket_server_user_mapping_by_username.yml
+++ b/config/feature_flags/ops/bitbucket_server_user_mapping_by_username.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/36885
rollout_issue_url: # No rollout: This is an ops-flag
milestone: '13.4'
type: ops
-group: group::import
+group: group::import and integrate
default_enabled: false # Flag should be kept disabled by default
diff --git a/config/feature_flags/ops/certificate_based_clusters.yml b/config/feature_flags/ops/certificate_based_clusters.yml
index 65a05377774..47e3c92cbad 100644
--- a/config/feature_flags/ops/certificate_based_clusters.yml
+++ b/config/feature_flags/ops/certificate_based_clusters.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81054
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353410
milestone: '14.9'
type: ops
-group: group::configure
+group: group::environments
default_enabled: false
diff --git a/config/feature_flags/ops/skip_rugged_auto_detect.yml b/config/feature_flags/ops/ci_unlock_pipelines.yml
index 57da3bba4ea..c3503fab86c 100644
--- a/config/feature_flags/ops/skip_rugged_auto_detect.yml
+++ b/config/feature_flags/ops/ci_unlock_pipelines.yml
@@ -1,8 +1,8 @@
---
-name: skip_rugged_auto_detect
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95330
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/370708
-milestone: '15.3'
+name: ci_unlock_pipelines
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124112
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/415503
+milestone: '16.2'
type: ops
-group: group::gitaly
+group: group::pipeline security
default_enabled: true
diff --git a/config/feature_flags/ops/gitlab_gtm_datalayer.yml b/config/feature_flags/ops/ci_unlock_pipelines_high.yml
index f41506ce114..52cdd9b8451 100644
--- a/config/feature_flags/ops/gitlab_gtm_datalayer.yml
+++ b/config/feature_flags/ops/ci_unlock_pipelines_high.yml
@@ -1,8 +1,8 @@
---
-name: gitlab_gtm_datalayer
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76305
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/348932
-milestone: '14.6'
+name: ci_unlock_pipelines_high
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124112
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/415503
+milestone: '16.2'
type: ops
-group: group::buyer experience
+group: group::pipeline security
default_enabled: false
diff --git a/config/feature_flags/ops/gtm_nonce.yml b/config/feature_flags/ops/ci_unlock_pipelines_medium.yml
index c206efd2a08..e74278d5ff5 100644
--- a/config/feature_flags/ops/gtm_nonce.yml
+++ b/config/feature_flags/ops/ci_unlock_pipelines_medium.yml
@@ -1,8 +1,8 @@
---
-name: gtm_nonce
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58494
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/346322
-milestone: '14.6'
+name: ci_unlock_pipelines_medium
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124112
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/415503
+milestone: '16.2'
type: ops
-group: group::product intelligence
+group: group::pipeline security
default_enabled: false
diff --git a/config/feature_flags/ops/ecomm_instrumentation.yml b/config/feature_flags/ops/ecomm_instrumentation.yml
index e35937fa344..021897cf49a 100644
--- a/config/feature_flags/ops/ecomm_instrumentation.yml
+++ b/config/feature_flags/ops/ecomm_instrumentation.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71243
rollout_issue_url:
milestone: '14.4'
type: ops
-group: group::product intelligence
+group: group::analytics instrumentation
default_enabled: false
diff --git a/config/feature_flags/ops/github_importer_lower_per_page_limit.yml b/config/feature_flags/ops/github_importer_lower_per_page_limit.yml
index d3a446dc125..fa0e5d30b7d 100644
--- a/config/feature_flags/ops/github_importer_lower_per_page_limit.yml
+++ b/config/feature_flags/ops/github_importer_lower_per_page_limit.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67150
rollout_issue_url:
milestone: '14.2'
type: ops
-group: group::import
+group: group::import and integrate
default_enabled: false
diff --git a/config/feature_flags/ops/global_search_epics_tab.yml b/config/feature_flags/ops/global_search_epics_tab.yml
new file mode 100644
index 00000000000..42067e9ad93
--- /dev/null
+++ b/config/feature_flags/ops/global_search_epics_tab.yml
@@ -0,0 +1,8 @@
+---
+name: global_search_epics_tab
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/130146
+rollout_issue_url:
+milestone: '16.5'
+type: ops
+group: group::global search
+default_enabled: false
diff --git a/config/feature_flags/ops/kubernetes_agent_internal_api.yml b/config/feature_flags/ops/kubernetes_agent_internal_api.yml
index 34731aaeb52..3f3ca5a4335 100644
--- a/config/feature_flags/ops/kubernetes_agent_internal_api.yml
+++ b/config/feature_flags/ops/kubernetes_agent_internal_api.yml
@@ -1,8 +1,8 @@
---
name: kubernetes_agent_internal_api
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41045
-rollout_issue_url:
+rollout_issue_url:
milestone: '13.4'
type: ops
-group: group::configure
+group: group::environments
default_enabled: true
diff --git a/config/feature_flags/ops/mask_page_urls.yml b/config/feature_flags/ops/mask_page_urls.yml
index a752d1c8796..5931d7a6863 100644
--- a/config/feature_flags/ops/mask_page_urls.yml
+++ b/config/feature_flags/ops/mask_page_urls.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69448
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340181
milestone: '14.3'
type: ops
-group: group::product intelligence
+group: group::analytics instrumentation
default_enabled: false
diff --git a/config/feature_flags/ops/override_bulk_import_disabled.yml b/config/feature_flags/ops/override_bulk_import_disabled.yml
new file mode 100644
index 00000000000..057170a30ad
--- /dev/null
+++ b/config/feature_flags/ops/override_bulk_import_disabled.yml
@@ -0,0 +1,8 @@
+---
+name: override_bulk_import_disabled
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132431
+rollout_issue_url:
+milestone: '16.5'
+type: ops
+group: group::import and integrate
+default_enabled: false
diff --git a/config/feature_flags/ops/performance_bar_stats.yml b/config/feature_flags/ops/performance_bar_stats.yml
index 00f2a8eeef8..77c6562c350 100644
--- a/config/feature_flags/ops/performance_bar_stats.yml
+++ b/config/feature_flags/ops/performance_bar_stats.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48149
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/285480
milestone: '13.7'
type: ops
-group: group::product_planning
+group: group::product planning
default_enabled: false
diff --git a/config/feature_flags/ops/redis_hll_tracking.yml b/config/feature_flags/ops/redis_hll_tracking.yml
index 6570143d60d..58d36a42642 100644
--- a/config/feature_flags/ops/redis_hll_tracking.yml
+++ b/config/feature_flags/ops/redis_hll_tracking.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56970
rollout_issue_url:
milestone: '13.11'
type: ops
-group: group::product intelligence
+group: group::analytics instrumentation
default_enabled: true
diff --git a/config/feature_flags/ops/show_gitlab_agent_feedback.yml b/config/feature_flags/ops/show_gitlab_agent_feedback.yml
index 2e2af65fea8..f6c3c17b48e 100644
--- a/config/feature_flags/ops/show_gitlab_agent_feedback.yml
+++ b/config/feature_flags/ops/show_gitlab_agent_feedback.yml
@@ -1,8 +1,8 @@
---
name: show_gitlab_agent_feedback
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78567
-rollout_issue_url:
+rollout_issue_url:
milestone: '14.8'
type: ops
-group: group::configure
+group: group::environments
default_enabled: true
diff --git a/config/feature_flags/ops/show_terraform_banner.yml b/config/feature_flags/ops/show_terraform_banner.yml
index a4ec831f4e4..5af9ab0a9f7 100644
--- a/config/feature_flags/ops/show_terraform_banner.yml
+++ b/config/feature_flags/ops/show_terraform_banner.yml
@@ -1,8 +1,8 @@
---
name: show_terraform_banner
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71462
-rollout_issue_url:
+rollout_issue_url:
milestone: '14.4'
type: ops
-group: group::configure
+group: group::environments
default_enabled: true
diff --git a/config/feature_flags/ops/usage_data_api.yml b/config/feature_flags/ops/usage_data_api.yml
index edb78c151d5..7f2f2c1b127 100644
--- a/config/feature_flags/ops/usage_data_api.yml
+++ b/config/feature_flags/ops/usage_data_api.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41301
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/267114
milestone: '13.4'
type: ops
-group: group::product intelligence
+group: group::analytics instrumentation
default_enabled: true
diff --git a/config/feature_flags/ops/usage_data_non_sql_metrics.yml b/config/feature_flags/ops/usage_data_non_sql_metrics.yml
index 8347a20fe47..5e3fb8524c6 100644
--- a/config/feature_flags/ops/usage_data_non_sql_metrics.yml
+++ b/config/feature_flags/ops/usage_data_non_sql_metrics.yml
@@ -1,8 +1,8 @@
---
name: usage_data_non_sql_metrics
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57050
-rollout_issue_url:
+rollout_issue_url:
milestone: '13.11'
type: ops
-group: group::product intelligence
+group: group::analytics instrumentation
default_enabled: false
diff --git a/config/feature_flags/ops/usage_data_queries_api.yml b/config/feature_flags/ops/usage_data_queries_api.yml
index 4b6cdad2521..67e6cd0e106 100644
--- a/config/feature_flags/ops/usage_data_queries_api.yml
+++ b/config/feature_flags/ops/usage_data_queries_api.yml
@@ -1,8 +1,8 @@
---
name: usage_data_queries_api
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57016
-rollout_issue_url:
+rollout_issue_url:
milestone: '13.11'
type: ops
-group: group::product intelligence
+group: group::analytics instrumentation
default_enabled: false
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 07be2bbf57b..5002e9e24bf 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -657,6 +657,10 @@ production: &base
ci_runners_stale_group_runners_prune_worker_cron:
cron: "30 * * * *"
+ # Periodically queue syncing of finished builds from p_ci_finished_build_ch_sync_events to ClickHouse
+ click_house_ci_finished_builds_sync_worker:
+ cron: "*/3 * * * *"
+
registry:
# enabled: true
# host: registry.example.com
diff --git a/config/gitlab_loose_foreign_keys.yml b/config/gitlab_loose_foreign_keys.yml
index 54ebf8d3562..38d03638a4b 100644
--- a/config/gitlab_loose_foreign_keys.yml
+++ b/config/gitlab_loose_foreign_keys.yml
@@ -302,6 +302,12 @@ projects:
- table: organizations
column: organization_id
on_delete: async_nullify
+ - table: users
+ column: marked_for_deletion_by_user_id
+ on_delete: async_nullify
+ - table: users
+ column: creator_id
+ on_delete: async_nullify
projects_visits:
- table: projects
column: entity_id
@@ -360,4 +366,4 @@ vulnerability_state_transitions:
vulnerability_statistics:
- table: ci_pipelines
column: latest_pipeline_id
- on_delete: async_nullify \ No newline at end of file
+ on_delete: async_nullify
diff --git a/config/initializers/0_1_yaml_safe_load_file_patch.rb b/config/initializers/0_1_yaml_safe_load_file_patch.rb
deleted file mode 100644
index f43712900eb..00000000000
--- a/config/initializers/0_1_yaml_safe_load_file_patch.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-# TODO: Remove this once we're on Ruby 3
-# https://gitlab.com/gitlab-org/gitlab/-/issues/393651
-unless YAML.respond_to?(:safe_load_file)
- module YAML
- # Temporary Ruby 2 back-compat workaround.
- #
- # This method only exists as of stdlib 3.0.0:
- # https://ruby-doc.org/stdlib-3.0.0/libdoc/psych/rdoc/Psych.html
- def self.safe_load_file(path, **options)
- YAML.safe_load(File.read(path), **options)
- end
- end
-end
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index bdc5f48f485..e2e5c37aa43 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -692,6 +692,9 @@ Settings.cron_jobs['service_desk_custom_email_verification_cleanup']['job_class'
Settings.cron_jobs['ensure_merge_requests_prepared_worker'] ||= {}
Settings.cron_jobs['ensure_merge_requests_prepared_worker']['cron'] ||= '*/30 * * * *'
Settings.cron_jobs['ensure_merge_requests_prepared_worker']['job_class'] ||= 'MergeRequests::EnsurePreparedWorker'
+Settings.cron_jobs['deactivated_pages_deployments_delete_cron_worker'] ||= {}
+Settings.cron_jobs['deactivated_pages_deployments_delete_cron_worker']['cron'] ||= '*/10 * * * *'
+Settings.cron_jobs['deactivated_pages_deployments_delete_cron_worker']['job_class'] ||= 'Pages::DeactivatedDeploymentsDeleteCronWorker'
Gitlab.ee do
Settings.cron_jobs['analytics_devops_adoption_create_all_snapshots_worker'] ||= {}
@@ -742,18 +745,9 @@ Gitlab.ee do
Settings.cron_jobs['geo_prune_event_log_worker'] ||= {}
Settings.cron_jobs['geo_prune_event_log_worker']['cron'] ||= '*/5 * * * *'
Settings.cron_jobs['geo_prune_event_log_worker']['job_class'] ||= 'Geo::PruneEventLogWorker'
- Settings.cron_jobs['geo_repository_sync_worker'] ||= {}
- Settings.cron_jobs['geo_repository_sync_worker']['cron'] ||= '*/1 * * * *'
- Settings.cron_jobs['geo_repository_sync_worker']['job_class'] ||= 'Geo::RepositorySyncWorker'
Settings.cron_jobs['geo_secondary_registry_consistency_worker'] ||= {}
Settings.cron_jobs['geo_secondary_registry_consistency_worker']['cron'] ||= '* * * * *'
Settings.cron_jobs['geo_secondary_registry_consistency_worker']['job_class'] ||= 'Geo::Secondary::RegistryConsistencyWorker'
- Settings.cron_jobs['geo_repository_verification_primary_batch_worker'] ||= {}
- Settings.cron_jobs['geo_repository_verification_primary_batch_worker']['cron'] ||= '*/1 * * * *'
- Settings.cron_jobs['geo_repository_verification_primary_batch_worker']['job_class'] ||= 'Geo::RepositoryVerification::Primary::BatchWorker'
- Settings.cron_jobs['geo_repository_verification_secondary_scheduler_worker'] ||= {}
- Settings.cron_jobs['geo_repository_verification_secondary_scheduler_worker']['cron'] ||= '*/1 * * * *'
- Settings.cron_jobs['geo_repository_verification_secondary_scheduler_worker']['job_class'] ||= 'Geo::RepositoryVerification::Secondary::SchedulerWorker'
Settings.cron_jobs['historical_data_worker'] ||= {}
Settings.cron_jobs['historical_data_worker']['cron'] ||= '0 12 * * *'
Settings.cron_jobs['historical_data_worker']['job_class'] = 'HistoricalDataWorker'
@@ -874,6 +868,12 @@ Gitlab.ee do
Settings.cron_jobs['package_metadata_advisories_sync_worker'] ||= {}
Settings.cron_jobs['package_metadata_advisories_sync_worker']['cron'] ||= "*/5 * * * *"
Settings.cron_jobs['package_metadata_advisories_sync_worker']['job_class'] = 'PackageMetadata::AdvisoriesSyncWorker'
+ Settings.cron_jobs['okr_checkin_reminder_emails'] ||= {}
+ Settings.cron_jobs['okr_checkin_reminder_emails']['cron'] ||= "0 1 * * *"
+ Settings.cron_jobs['okr_checkin_reminder_emails']['job_class'] = 'Okrs::CheckinReminderEmailsCronWorker'
+ Settings.cron_jobs['ci_schedule_unlock_pipelines_in_queue_worker'] ||= {}
+ Settings.cron_jobs['ci_schedule_unlock_pipelines_in_queue_worker']['cron'] ||= '*/1 * * * *'
+ Settings.cron_jobs['ci_schedule_unlock_pipelines_in_queue_worker']['job_class'] = 'Ci::ScheduleUnlockPipelinesInQueueCronWorker'
Gitlab.com do
Settings.cron_jobs['disable_legacy_open_source_license_for_inactive_projects'] ||= {}
@@ -885,9 +885,19 @@ Gitlab.ee do
Settings.cron_jobs['gitlab_subscriptions_schedule_refresh_seats_worker'] ||= {}
Settings.cron_jobs['gitlab_subscriptions_schedule_refresh_seats_worker']['cron'] ||= "0 */6 * * *"
Settings.cron_jobs['gitlab_subscriptions_schedule_refresh_seats_worker']['job_class'] = 'GitlabSubscriptions::ScheduleRefreshSeatsWorker'
+ Settings.cron_jobs['gitlab_subscriptions_add_on_purchases_schedule_bulk_refresh_user_assignments_worker'] ||= {}
+ Settings.cron_jobs['gitlab_subscriptions_add_on_purchases_schedule_bulk_refresh_user_assignments_worker']['cron'] ||= "0 */4 * * *"
+ Settings.cron_jobs['gitlab_subscriptions_add_on_purchases_schedule_bulk_refresh_user_assignments_worker']['job_class'] = 'GitlabSubscriptions::AddOnPurchases::ScheduleBulkRefreshUserAssignmentsWorker'
Settings.cron_jobs['click_house_events_sync_worker'] ||= {}
Settings.cron_jobs['click_house_events_sync_worker']['cron'] ||= "*/3 * * * *"
Settings.cron_jobs['click_house_events_sync_worker']['job_class'] = 'ClickHouse::EventsSyncWorker'
+ Settings.cron_jobs['click_house_ci_finished_builds_sync_worker'] ||= {}
+ Settings.cron_jobs['click_house_ci_finished_builds_sync_worker']['cron'] ||= '*/3 * * * *'
+ Settings.cron_jobs['click_house_ci_finished_builds_sync_worker']['args'] ||= [1]
+ Settings.cron_jobs['click_house_ci_finished_builds_sync_worker']['job_class'] = 'ClickHouse::CiFinishedBuildsSyncCronWorker'
+ Settings.cron_jobs['vertex_ai_refresh_access_token_worker'] ||= {}
+ Settings.cron_jobs['vertex_ai_refresh_access_token_worker']['cron'] ||= '*/50 * * * *'
+ Settings.cron_jobs['vertex_ai_refresh_access_token_worker']['job_class'] = 'Llm::VertexAiAccessTokenRefreshWorker'
end
end
diff --git a/config/initializers/8_devise.rb b/config/initializers/8_devise.rb
index 3682a391033..9ea26602a13 100644
--- a/config/initializers/8_devise.rb
+++ b/config/initializers/8_devise.rb
@@ -162,10 +162,18 @@ Devise.setup do |config|
# Number of authentication tries before locking an account if lock_strategy
# is failed attempts.
- config.maximum_attempts = 10
+ config.maximum_attempts = if Gitlab::CurrentSettings.max_login_attempts_column_exists?
+ (Gitlab::CurrentSettings.max_login_attempts || 10)
+ else
+ 10
+ end
# Time interval to unlock the account if :time is enabled as unlock_strategy.
- config.unlock_in = 10.minutes
+ config.unlock_in = if Gitlab::CurrentSettings.failed_login_attempts_unlock_period_in_minutes_column_exists?
+ (Gitlab::CurrentSettings.failed_login_attempts_unlock_period_in_minutes || 10).minutes
+ else
+ 10.minutes
+ end
# ==> Configuration for :recoverable
#
diff --git a/config/initializers/click_house.rb b/config/initializers/click_house.rb
index ecf1ccb97bf..3a66cbd759a 100644
--- a/config/initializers/click_house.rb
+++ b/config/initializers/click_house.rb
@@ -17,16 +17,11 @@ ClickHouse::Client.configure do |config|
)
end
- if Rails.env.development? || Rails.env.test?
- config.logger = ::ClickHouse::Logger.build
- config.log_proc = ->(query) do
- structured_log(query.to_sql)
- end
- else
- config.logger = Logger.new('/dev/null')
- config.log_proc = ->(query) do
- structured_log(query.to_redacted_sql)
- end
+ config.logger = ::ClickHouse::Logger.build
+ config.log_proc = ->(query) do
+ query_output =
+ Rails.env.production? ? query.to_redacted_sql : query.to_sql
+ structured_log(query_output)
end
config.json_parser = Gitlab::Json
@@ -34,7 +29,7 @@ ClickHouse::Client.configure do |config|
options = {
multipart: true,
headers: headers,
- allow_local_requests: Rails.env.development? || Rails.env.test?
+ allow_local_requests: true
}
body_key = body.is_a?(IO) ? :body_stream : :body
diff --git a/config/initializers/declarative_policy_cached_attributes.rb b/config/initializers/declarative_policy_cached_attributes.rb
deleted file mode 100644
index c05a7609fec..00000000000
--- a/config/initializers/declarative_policy_cached_attributes.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-# This module memoizes some attributes to reduce memory allocations.
-#
-# See https://gitlab.com/gitlab-org/gitlab/-/issues/420623
-# See https://gitlab.com/gitlab-org/ruby/gems/declarative-policy/-/merge_requests/52
-module DeclarativePolicyCachedAttributes
- def ability_map
- @ability_map ||= super
- end
-
- def conditions
- @conditions ||= super
- end
-
- def global_actions
- @global_actions ||= super
- end
-
- def delegations
- @delegations ||= super
- end
-end
-
-DeclarativePolicy::Base.singleton_class.prepend(DeclarativePolicyCachedAttributes)
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index f343c20dfe4..3572c30cdd3 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -22,13 +22,14 @@ Doorkeeper.configure do
end
end
- resource_owner_from_credentials do |routes|
- user = Gitlab::Auth.find_with_user_password(params[:username], params[:password], increment_failed_attempts: true)
-
+ resource_owner_from_credentials do |_routes|
+ user = User.find_by_login(params[:username])
next unless user
+
+ next if user.password_automatically_set?
next if user.two_factor_enabled? || Gitlab::Auth::TwoFactorAuthVerifier.new(user).two_factor_authentication_enforced?
- user
+ Gitlab::Auth.find_with_user_password(params[:username], params[:password], increment_failed_attempts: true)
end
# If you want to restrict access to the web interface for adding oauth authorized applications, you need to declare the block below.
diff --git a/config/initializers/gitlab_http.rb b/config/initializers/gitlab_http.rb
new file mode 100644
index 00000000000..8a84313a7fb
--- /dev/null
+++ b/config/initializers/gitlab_http.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+# When including this gem, we also initialize the patch / override classes in the gem.
+require 'gitlab-http'
+
+Gitlab::HTTP_V2.configure do |config|
+ config.allowed_internal_uris = [
+ URI::HTTP.build(
+ scheme: Gitlab.config.gitlab.protocol,
+ host: Gitlab.config.gitlab.host,
+ port: Gitlab.config.gitlab.port
+ ),
+ URI::Generic.build(
+ scheme: 'ssh',
+ host: Gitlab.config.gitlab_shell.ssh_host,
+ port: Gitlab.config.gitlab_shell.ssh_port
+ )
+ ]
+
+ config.log_exception_proc = ->(exception, extra_info) do
+ Gitlab::ErrorTracking.log_exception(exception, extra_info)
+ end
+ config.silent_mode_log_info_proc = ->(message, http_method) do
+ Gitlab::SilentMode.log_info(message: message, outbound_http_request_method: http_method)
+ end
+end
diff --git a/config/initializers/hangouts_chat_http_override.rb b/config/initializers/hangouts_chat_http_override.rb
deleted file mode 100644
index 42ffb6f78e1..00000000000
--- a/config/initializers/hangouts_chat_http_override.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-HangoutsChat::Sender::HTTP.prepend(Gitlab::Patch::HangoutsChatHTTPOverride)
diff --git a/config/initializers/http_hostname_override.rb b/config/initializers/http_hostname_override.rb
deleted file mode 100644
index 3d840cd3251..00000000000
--- a/config/initializers/http_hostname_override.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-# frozen_string_literal: true
-
-# This override allows passing `@hostname_override` to the SNI protocol,
-# which is used to lookup the correct SSL certificate in the
-# request handshake process.
-#
-# Given we've forced the HTTP request to be sent to the resolved
-# IP address in a few scenarios (e.g.: `Gitlab::HTTP` through
-# `Gitlab::UrlBlocker.validate!`), we need to provide the _original_
-# hostname via SNI in order to have a clean connection setup.
-#
-# This is ultimately needed in order to avoid DNS rebinding attacks
-# through HTTP requests.
-#
-class OpenSSL::SSL::SSLContext
- attr_accessor :hostname_override
-end
-
-class OpenSSL::SSL::SSLSocket
- module HostnameOverride
- # rubocop: disable Gitlab/ModuleWithInstanceVariables
- def hostname=(hostname)
- super(@context.hostname_override || hostname)
- end
-
- def post_connection_check(hostname)
- super(@context.hostname_override || hostname)
- end
- # rubocop: enable Gitlab/ModuleWithInstanceVariables
- end
-
- prepend HostnameOverride
-end
-
-class Net::HTTP
- attr_accessor :hostname_override
-
- SSL_IVNAMES << :@hostname_override
- SSL_ATTRIBUTES << :hostname_override
-
- module HostnameOverride
- def addr_port
- return super unless hostname_override
-
- addr = hostname_override
- default_port = use_ssl? ? Net::HTTP.https_default_port : Net::HTTP.http_default_port
- default_port == port ? addr : "#{addr}:#{port}"
- end
- end
-
- prepend HostnameOverride
-end
diff --git a/config/initializers/net_http_patch.rb b/config/initializers/net_http_patch.rb
deleted file mode 100644
index 8231423e1a5..00000000000
--- a/config/initializers/net_http_patch.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-# Monkey patch Net::HTTP to fix missing URL decoding for username and password in proxy settings
-#
-# See proposed upstream fix https://github.com/ruby/net-http/pull/5
-# See Ruby-lang issue https://bugs.ruby-lang.org/issues/17542
-# See issue on GitLab https://gitlab.com/gitlab-org/gitlab/-/issues/289836
-
-require 'net/http'
-
-# This file can be removed once Ruby 3.0 is no longer supported:
-# https://gitlab.com/gitlab-org/gitlab/-/issues/396223
-return if Gem::Version.new(Net::HTTP::VERSION) >= Gem::Version.new('0.2.0')
-
-module Net
- class HTTP < Protocol
- def proxy_user
- if environment_variable_is_multiuser_safe? && @proxy_from_env
- user = proxy_uri&.user
- CGI.unescape(user) unless user.nil?
- else
- @proxy_user
- end
- end
-
- def proxy_pass
- if environment_variable_is_multiuser_safe? && @proxy_from_env
- pass = proxy_uri&.password
- CGI.unescape(pass) unless pass.nil?
- else
- @proxy_pass
- end
- end
-
- def environment_variable_is_multiuser_safe?
- ENVIRONMENT_VARIABLE_IS_MULTIUSER_SAFE
- end
- end
-end
diff --git a/config/initializers/net_http_response_patch.rb b/config/initializers/net_http_response_patch.rb
deleted file mode 100644
index 4f3eaeec24a..00000000000
--- a/config/initializers/net_http_response_patch.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-module Net
- class HTTPResponse
- # rubocop: disable Cop/LineBreakAfterGuardClauses
- # rubocop: disable Cop/LineBreakAroundConditionalBlock
- # rubocop: disable Layout/EmptyLineAfterGuardClause
- # rubocop: disable Style/AndOr
- # rubocop: disable Style/CharacterLiteral
- # rubocop: disable Style/InfiniteLoop
-
- # Original method:
- # https://github.com/ruby/ruby/blob/v2_7_5/lib/net/http/response.rb#L54-L69
- #
- # Our changes:
- # - Pass along the `start_time` to `Gitlab::BufferedIo`, so we can raise a timeout
- # if reading the headers takes too long.
- # - Limit the regexes to avoid ReDoS attacks.
- def self.each_response_header(sock)
- start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
- key = value = nil
- while true
- line = sock.is_a?(Gitlab::BufferedIo) ? sock.readuntil("\n", true, start_time) : sock.readuntil("\n", true)
- line = line.sub(/\s{0,10}\z/, '')
- break if line.empty?
- if line[0] == ?\s or line[0] == ?\t and value
- # rubocop:disable Gitlab/NoCodeCoverageComment
- # :nocov:
- value << ' ' unless value.empty?
- value << line.strip
- # :nocov:
- # rubocop:enable Gitlab/NoCodeCoverageComment
- else
- yield key, value if key
- key, value = line.strip.split(/\s{0,10}:\s{0,10}/, 2)
- raise Net::HTTPBadResponse, 'wrong header line format' if value.nil?
- end
- end
- yield key, value if key
- end
- # rubocop: enable Cop/LineBreakAfterGuardClauses
- # rubocop: enable Cop/LineBreakAroundConditionalBlock
- # rubocop: enable Layout/EmptyLineAfterGuardClause
- # rubocop: enable Style/AndOr
- # rubocop: enable Style/CharacterLiteral
- # rubocop: enable Style/InfiniteLoop
- end
-end
diff --git a/config/initializers/postgres_partitioning.rb b/config/initializers/postgres_partitioning.rb
index a7728bf51b3..073b487ff73 100644
--- a/config/initializers/postgres_partitioning.rb
+++ b/config/initializers/postgres_partitioning.rb
@@ -8,6 +8,7 @@ Gitlab::Database::Partitioning.register_models(
Gitlab::Database::BackgroundMigration::BatchedJobTransitionLog,
Ci::RunnerManagerBuild,
Ci::JobAnnotation,
+ Ci::BuildMetadata,
BatchedGitRefUpdates::Deletion,
Users::ProjectVisit,
Users::GroupVisit
@@ -19,7 +20,8 @@ if Gitlab.ee?
IncidentManagement::PendingEscalations::Alert,
IncidentManagement::PendingEscalations::Issue,
Security::Finding,
- Analytics::ValueStreamDashboard::Count
+ Analytics::ValueStreamDashboard::Count,
+ Ci::FinishedBuildChSyncEvent
])
else
Gitlab::Database::Partitioning.register_tables(
diff --git a/config/initializers/rest-client-hostname_override.rb b/config/initializers/rest-client-hostname_override.rb
index b647fe9cac8..41988fad282 100644
--- a/config/initializers/rest-client-hostname_override.rb
+++ b/config/initializers/rest-client-hostname_override.rb
@@ -13,7 +13,7 @@ module RestClient
schemes: %w[http https])
self.hostname_override = hostname_override
- rescue Gitlab::UrlBlocker::BlockedUrlError => e
+ rescue Gitlab::HTTP_V2::UrlBlocker::BlockedUrlError => e
raise ArgumentError, "URL is blocked: #{e.message}"
end
diff --git a/config/initializers_before_autoloader/004_zeitwerk.rb b/config/initializers_before_autoloader/004_zeitwerk.rb
index 2d54ab87dca..689da6e390c 100644
--- a/config/initializers_before_autoloader/004_zeitwerk.rb
+++ b/config/initializers_before_autoloader/004_zeitwerk.rb
@@ -35,6 +35,7 @@ Rails.autoloaders.each do |autoloader|
'html_parser' => 'HTMLParser',
'html_gitlab' => 'HTMLGitlab',
'http' => 'HTTP',
+ 'legacy_http' => 'LegacyHTTP',
'http_connection_adapter' => 'HTTPConnectionAdapter',
'http_clone_enabled_check' => 'HTTPCloneEnabledCheck',
'hangouts_chat_http_override' => 'HangoutsChatHTTPOverride',
diff --git a/config/locales/doorkeeper.en.yml b/config/locales/doorkeeper.en.yml
index 9568195bb6e..ae8eea3bbda 100644
--- a/config/locales/doorkeeper.en.yml
+++ b/config/locales/doorkeeper.en.yml
@@ -114,6 +114,41 @@ en:
Grants create access to the runners.
k8s_proxy:
Grants permission to perform Kubernetes API calls using the agent for Kubernetes.
+ group_access_token_scope_desc:
+ api:
+ Grants complete read and write access to the scoped group and related project API, including the Package Registry.
+ read_api:
+ Grants read access to the scoped group and related project API, including the Package Registry.
+ read_user:
+ Grants read-only access to the authenticated user's profile through the /user API endpoint, which includes username, public email, and full name. Also grants access to read-only API endpoints under /users.
+ read_repository:
+ Grants read access (pull) to all repositories within a group.
+ write_repository:
+ Grants read and write access (pull and push) to all repositories within a group.
+ read_registry:
+ Grants read access (pull) to the Container Registry images if any project within a group is private and authorization is required.
+ write_registry:
+ Grants write access (push) to the Container Registry.
+ read_observability:
+ Grants read-only access to GitLab Observability.
+ write_observability:
+ Grants write access to GitLab Observability.
+ ai_features:
+ Grants permission to perform API actions for GitLab Duo.
+ openid:
+ Grants permission to authenticate with GitLab using OpenID Connect. Also gives read-only access to the user's profile and group memberships.
+ sudo:
+ Grants permission to perform API actions as any user in the system, when authenticated as an admin user.
+ profile:
+ Grants read-only access to the user's profile data using OpenID Connect.
+ email:
+ Grants read-only access to the user's primary email address using OpenID Connect.
+ admin_mode:
+ Grants permission to perform API actions as an administrator, when Admin Mode is enabled.
+ create_runner:
+ Grants permission to create runners in a group.
+ k8s_proxy:
+ Grants permission to perform Kubernetes API calls using the agent for Kubernetes in a group.
project_access_token_scope_desc:
api:
Grants complete read and write access to the scoped project API, including the Package Registry.
@@ -127,10 +162,16 @@ en:
Grants read access (pull) to the Container Registry images if a project is private and authorization is required.
write_registry:
Grants write access (push) to the Container Registry.
+ read_observability:
+ Grants read-only access to GitLab Observability.
+ write_observability:
+ Grants write access to GitLab Observability.
create_runner:
Grants create access to the runners.
k8s_proxy:
Grants permission to perform Kubernetes API calls using the agent for Kubernetes.
+ ai_features:
+ Grants access to GitLab Duo related API endpoints.
flash:
applications:
create:
diff --git a/config/metrics/counts_28d/20210216180816_groups.yml b/config/metrics/counts_28d/20210216180816_groups.yml
index f0d1bdc5382..4c79c9e6268 100644
--- a/config/metrics/counts_28d/20210216180816_groups.yml
+++ b/config/metrics/counts_28d/20210216180816_groups.yml
@@ -2,9 +2,9 @@
data_category: optional
key_path: usage_activity_by_stage_monthly.manage.groups
description: Number of users who are group members for last 28 days
-product_section: dev
-product_stage: manage
-product_group: authentication_and_authorization
+product_section: sec
+product_stage: govern
+product_group: authentication
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180818_users_created.yml b/config/metrics/counts_28d/20210216180818_users_created.yml
index a99129a6a10..e19048661a2 100644
--- a/config/metrics/counts_28d/20210216180818_users_created.yml
+++ b/config/metrics/counts_28d/20210216180818_users_created.yml
@@ -2,9 +2,9 @@
data_category: optional
key_path: usage_activity_by_stage_monthly.manage.users_created
description: Number of users created in the month
-product_section: dev
-product_stage: manage
-product_group: authentication_and_authorization
+product_section: sec
+product_stage: govern
+product_group: authentication
value_type: number
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216181050_packages.yml b/config/metrics/counts_28d/20210216181050_packages.yml
index f22005838be..bcfa88f9b6e 100644
--- a/config/metrics/counts_28d/20210216181050_packages.yml
+++ b/config/metrics/counts_28d/20210216181050_packages.yml
@@ -9,6 +9,7 @@ value_type: number
status: active
time_frame: 28d
data_source: database
+instrumentation_class: CountPackagesMetric
distribution:
- ee
- ce
diff --git a/config/metrics/counts_28d/20210216183627_omniauth_providers.yml b/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
index e7764661dad..983dfc8a132 100644
--- a/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
+++ b/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
@@ -2,9 +2,9 @@
data_category: optional
key_path: usage_activity_by_stage_monthly.manage.omniauth_providers
description: List of unique OmniAuth providers
-product_section: dev
-product_stage: manage
-product_group: authentication_and_authorization
+product_section: sec
+product_stage: govern
+product_group: authentication
value_type: object
status: active
time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183701_jira.yml b/config/metrics/counts_28d/20210216183701_jira.yml
index 5ea1a771531..058c83fbdc8 100644
--- a/config/metrics/counts_28d/20210216183701_jira.yml
+++ b/config/metrics/counts_28d/20210216183701_jira.yml
@@ -9,6 +9,7 @@ value_type: number
status: active
time_frame: 28d
data_source: database
+instrumentation_class: CountJiraImportsMetric
distribution:
- ce
- ee
diff --git a/config/metrics/counts_28d/20210216183707_csv.yml b/config/metrics/counts_28d/20210216183707_csv.yml
index b1754f37f71..33934055b6c 100644
--- a/config/metrics/counts_28d/20210216183707_csv.yml
+++ b/config/metrics/counts_28d/20210216183707_csv.yml
@@ -9,6 +9,7 @@ value_type: number
status: active
time_frame: 28d
data_source: database
+instrumentation_class: CountCsvImportsMetric
distribution:
- ce
- ee
diff --git a/config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml b/config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml
index 2c17a6ec8f6..ec039160ab9 100644
--- a/config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml
+++ b/config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml
@@ -11,6 +11,7 @@ milestone: "14.0"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61775
time_frame: 28d
data_source: database
+instrumentation_class: CountProjectsMetric
distribution:
- ce
- ee
diff --git a/config/metrics/counts_28d/20210910132229_user_auth_by_provider.yml b/config/metrics/counts_28d/20210910132229_user_auth_by_provider.yml
index 791d4896e86..2c2cd670a80 100644
--- a/config/metrics/counts_28d/20210910132229_user_auth_by_provider.yml
+++ b/config/metrics/counts_28d/20210910132229_user_auth_by_provider.yml
@@ -1,9 +1,9 @@
---
key_path: usage_activity_by_stage_monthly.manage.user_auth_by_provider
description: Number of unique user logins using two factor authentication for available providers
-product_section: dev
-product_stage: manage
-product_group: authentication_and_authorization
+product_section: sec
+product_stage: govern
+product_group: authentication
value_type: object
status: active
milestone: "14.3"
diff --git a/config/metrics/counts_28d/20220825232557_count_user_auth.yml b/config/metrics/counts_28d/20220825232557_count_user_auth.yml
index f704340e439..7fd9a845130 100644
--- a/config/metrics/counts_28d/20220825232557_count_user_auth.yml
+++ b/config/metrics/counts_28d/20220825232557_count_user_auth.yml
@@ -1,9 +1,9 @@
---
key_path: usage_activity_by_stage_monthly.manage.count_user_auth
description: Number of unique user logins
-product_section: dev
-product_stage: manage
-product_group: authentication_and_authorization
+product_section: sec
+product_stage: govern
+product_group: authentication
value_type: number
status: active
milestone: "15.4"
diff --git a/config/metrics/counts_28d/20230620070723_k8s_api_proxy_requests_unique_agents_via_ci_access_monthly.yml b/config/metrics/counts_28d/20230620070723_k8s_api_proxy_requests_unique_agents_via_ci_access_monthly.yml
index 7520def5bda..5e734997df8 100644
--- a/config/metrics/counts_28d/20230620070723_k8s_api_proxy_requests_unique_agents_via_ci_access_monthly.yml
+++ b/config/metrics/counts_28d/20230620070723_k8s_api_proxy_requests_unique_agents_via_ci_access_monthly.yml
@@ -15,7 +15,8 @@ instrumentation_class: RedisHLLMetric
options:
events:
- k8s_api_proxy_requests_unique_agents_via_ci_access
-performance_indicator_type: []
+performance_indicator_type:
+- smau
distribution:
- ce
- ee
diff --git a/config/metrics/counts_28d/20230927152527_i_quickactions_add_child_monthly.yml b/config/metrics/counts_28d/20230927152527_i_quickactions_add_child_monthly.yml
new file mode 100644
index 00000000000..bef39963b56
--- /dev/null
+++ b/config/metrics/counts_28d/20230927152527_i_quickactions_add_child_monthly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_add_child_monthly
+name: quickactions_add_child_monthly
+description: Count of MAU using the `/add_child` quick action
+product_section: dev
+product_stage: plan
+product_group: product_planning
+value_type: number
+status: active
+milestone: "16.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132761
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+ events:
+ - i_quickactions_add_child
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/count_distinct_project_id_from_ci_template_included_28d.yml b/config/metrics/counts_28d/count_distinct_project_id_from_ci_template_included_28d.yml
new file mode 100644
index 00000000000..6050662f99c
--- /dev/null
+++ b/config/metrics/counts_28d/count_distinct_project_id_from_ci_template_included_28d.yml
@@ -0,0 +1,28 @@
+---
+key_path: redis_hll_counters.ci_templates.count_distinct_project_id_from_ci_template_included_28d
+description: Monthly count of unique projects that created a pipeline with a CI Template included.
+product_section: ops
+product_stage: verify
+product_group: pipeline_authoring
+performance_indicator_type: []
+value_type: number
+status: active
+milestone: "16.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132819
+time_frame: 28d
+data_source: internal_events
+data_category: optional
+instrumentation_class: RedisHLLMetric
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+ events:
+ - ci_template_included
+events:
+ - name: ci_template_included
+ unique: project.id
diff --git a/config/metrics/counts_7d/20230922165258_i_quickactions_set_parent_weekly.yml b/config/metrics/counts_7d/20230922165258_i_quickactions_set_parent_weekly.yml
new file mode 100644
index 00000000000..dfd05f15cb3
--- /dev/null
+++ b/config/metrics/counts_7d/20230922165258_i_quickactions_set_parent_weekly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_set_parent_weekly
+name: quickactions_set_parent_weekly
+description: Count of WAU using the `/set_parent` quick action
+product_section: dev
+product_stage: plan
+product_group: product_planning
+value_type: number
+status: active
+milestone: "16.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/122911
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+ events:
+ - i_quickactions_set_parent
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20230922165305_i_quickactions_set_parent_monthly.yml b/config/metrics/counts_7d/20230922165305_i_quickactions_set_parent_monthly.yml
new file mode 100644
index 00000000000..9af8f83ce79
--- /dev/null
+++ b/config/metrics/counts_7d/20230922165305_i_quickactions_set_parent_monthly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_set_parent_monthly
+name: quickactions_set_parent_monthly
+description: Count of MAU using the `/set_parent` quick action
+product_section: dev
+product_stage: plan
+product_group: product_planning
+value_type: number
+status: active
+milestone: "16.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/122911
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+ events:
+ - i_quickactions_set_parent
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20230927152525_i_quickactions_add_child_weekly.yml b/config/metrics/counts_7d/20230927152525_i_quickactions_add_child_weekly.yml
new file mode 100644
index 00000000000..7476a452d8f
--- /dev/null
+++ b/config/metrics/counts_7d/20230927152525_i_quickactions_add_child_weekly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_add_child_weekly
+name: quickactions_add_child_weekly
+description: Count of WAU using the `/add_child` quick action
+product_section: dev
+product_stage: plan
+product_group: product_planning
+value_type: number
+status: active
+milestone: "16.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132761
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+ events:
+ - i_quickactions_add_child
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/count_distinct_project_id_from_ci_template_included_7d.yml b/config/metrics/counts_7d/count_distinct_project_id_from_ci_template_included_7d.yml
new file mode 100644
index 00000000000..4c6be227130
--- /dev/null
+++ b/config/metrics/counts_7d/count_distinct_project_id_from_ci_template_included_7d.yml
@@ -0,0 +1,28 @@
+---
+key_path: redis_hll_counters.ci_templates.count_distinct_project_id_from_ci_template_included_7d
+description: Weekly count of unique projects that created a pipeline with a CI Template included.
+product_section: ops
+product_stage: verify
+product_group: pipeline_authoring
+performance_indicator_type: []
+value_type: number
+status: active
+milestone: "16.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132819
+time_frame: 7d
+data_source: internal_events
+data_category: optional
+instrumentation_class: RedisHLLMetric
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+ events:
+ - ci_template_included
+events:
+ - name: ci_template_included
+ unique: project.id
diff --git a/config/metrics/counts_all/20210216180242_web_ide_commits.yml b/config/metrics/counts_all/20210216180242_web_ide_commits.yml
index a5562cac4b1..a427d9840b8 100644
--- a/config/metrics/counts_all/20210216180242_web_ide_commits.yml
+++ b/config/metrics/counts_all/20210216180242_web_ide_commits.yml
@@ -14,6 +14,8 @@ options:
prefix: web_ide
event: commits_count
include_usage_prefix: false
+events:
+ - name: web_ide_commit_created
distribution:
- ce
- ee
diff --git a/config/metrics/counts_all/20210216180654_jira.yml b/config/metrics/counts_all/20210216180654_jira.yml
index 669deb00227..dc1e7119993 100644
--- a/config/metrics/counts_all/20210216180654_jira.yml
+++ b/config/metrics/counts_all/20210216180654_jira.yml
@@ -9,6 +9,7 @@ value_type: number
status: active
time_frame: all
data_source: database
+instrumentation_class: CountJiraImportsMetric
distribution:
- ce
- ee
diff --git a/config/metrics/counts_all/20210216180700_csv.yml b/config/metrics/counts_all/20210216180700_csv.yml
index cf1d3c2327f..9328e20db5e 100644
--- a/config/metrics/counts_all/20210216180700_csv.yml
+++ b/config/metrics/counts_all/20210216180700_csv.yml
@@ -9,6 +9,7 @@ value_type: number
status: active
time_frame: all
data_source: database
+instrumentation_class: CountCsvImportsMetric
distribution:
- ce
- ee
diff --git a/config/metrics/counts_all/20210216180750_groups.yml b/config/metrics/counts_all/20210216180750_groups.yml
index 329af5bf53c..908bff6ea1c 100644
--- a/config/metrics/counts_all/20210216180750_groups.yml
+++ b/config/metrics/counts_all/20210216180750_groups.yml
@@ -2,9 +2,9 @@
data_category: operational
key_path: counts.groups
description: Total count of groups as of usage ping snapshot
-product_section: dev
-product_stage: manage
-product_group: authentication_and_authorization
+product_section: sec
+product_stage: govern
+product_group: authentication
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180752_keys.yml b/config/metrics/counts_all/20210216180752_keys.yml
index 1471e2ab302..ad34973acd7 100644
--- a/config/metrics/counts_all/20210216180752_keys.yml
+++ b/config/metrics/counts_all/20210216180752_keys.yml
@@ -2,9 +2,9 @@
data_category: optional
key_path: counts.keys
description: Number of keys.
-product_section: dev
-product_stage: manage
-product_group: authentication_and_authorization
+product_section: sec
+product_stage: govern
+product_group: authentication
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180756_groups.yml b/config/metrics/counts_all/20210216180756_groups.yml
index 1764e203258..3da0b931cf9 100644
--- a/config/metrics/counts_all/20210216180756_groups.yml
+++ b/config/metrics/counts_all/20210216180756_groups.yml
@@ -2,9 +2,9 @@
data_category: optional
key_path: usage_activity_by_stage.manage.groups
description: Number of users who are group members.
-product_section: dev
-product_stage: manage
-product_group: authentication_and_authorization
+product_section: sec
+product_stage: govern
+product_group: authentication
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216180758_users_created.yml b/config/metrics/counts_all/20210216180758_users_created.yml
index cc885359d58..01e1f20a78d 100644
--- a/config/metrics/counts_all/20210216180758_users_created.yml
+++ b/config/metrics/counts_all/20210216180758_users_created.yml
@@ -2,9 +2,9 @@
data_category: optional
key_path: usage_activity_by_stage.manage.users_created
description: Number of users
-product_section: dev
-product_stage: manage
-product_group: authentication_and_authorization
+product_section: sec
+product_stage: govern
+product_group: authentication
value_type: number
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210216182004_commit_comment.yml b/config/metrics/counts_all/20210216182004_commit_comment.yml
index 009097245ef..82ad0e12b5f 100644
--- a/config/metrics/counts_all/20210216182004_commit_comment.yml
+++ b/config/metrics/counts_all/20210216182004_commit_comment.yml
@@ -13,6 +13,8 @@ instrumentation_class: RedisMetric
options:
prefix: note
event: create_commit
+events:
+ - name: commit_note_created
distribution:
- ce
- ee
diff --git a/config/metrics/counts_all/20210216182006_source_code_pushes.yml b/config/metrics/counts_all/20210216182006_source_code_pushes.yml
index 900ea7feaef..a6b46fb44a8 100644
--- a/config/metrics/counts_all/20210216182006_source_code_pushes.yml
+++ b/config/metrics/counts_all/20210216182006_source_code_pushes.yml
@@ -13,6 +13,8 @@ instrumentation_class: RedisMetric
options:
prefix: source_code
event: pushes
+events:
+ - name: source_code_pushed
distribution:
- ce
- ee
diff --git a/config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml b/config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml
index f60f74f132b..ffdc4e0cb8a 100644
--- a/config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml
+++ b/config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml
@@ -14,6 +14,8 @@ instrumentation_class: RedisMetric
options:
prefix: package_events
event: i_package_pull_package_by_guest
+events:
+ - name: package_pulled_by_guest
distribution:
- ee
- ce
diff --git a/config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml b/config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml
index 012254ffc6b..5f58ba81165 100644
--- a/config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml
+++ b/config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml
@@ -14,6 +14,8 @@ instrumentation_class: RedisMetric
options:
prefix: package_events
event: i_package_push_package_by_deploy_token
+events:
+ - name: package_pushed_using_deploy_token
distribution:
- ee
- ce
diff --git a/config/metrics/counts_all/20210216183400_omniauth_providers.yml b/config/metrics/counts_all/20210216183400_omniauth_providers.yml
index 22ff6084082..facf989686e 100644
--- a/config/metrics/counts_all/20210216183400_omniauth_providers.yml
+++ b/config/metrics/counts_all/20210216183400_omniauth_providers.yml
@@ -2,9 +2,9 @@
data_category: optional
key_path: usage_activity_by_stage.manage.omniauth_providers
description: List of unique OmniAuth providers
-product_section: dev
-product_stage: manage
-product_group: authentication_and_authorization
+product_section: sec
+product_stage: govern
+product_group: authentication
value_type: object
status: active
time_frame: all
diff --git a/config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml b/config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml
index d4d17a6a2b4..8e16f073757 100644
--- a/config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml
+++ b/config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml
@@ -6,8 +6,10 @@ product_section: 'TBD'
product_stage: growth
product_group: activation
value_type: number
-status: active
-milestone: "13.12"
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131860
+milestone_removed: '16.5'
+milestone: '13.12'
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
time_frame: all
data_source: database
@@ -16,9 +18,9 @@ options:
track: create
series: 0
distribution:
-- ce
-- ee
+ - ce
+ - ee
tier:
-- free
-- premium
-- ultimate
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml b/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml
index 0b61624c409..68f0629928c 100644
--- a/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml
@@ -6,8 +6,10 @@ product_section: 'TBD'
product_stage: growth
product_group: activation
value_type: number
-status: active
-milestone: "13.12"
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131860
+milestone_removed: '16.5'
+milestone: '13.12'
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
time_frame: all
data_source: database
@@ -16,9 +18,9 @@ options:
track: create
series: 0
distribution:
-- ce
-- ee
+ - ce
+ - ee
tier:
-- free
-- premium
-- ultimate
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml b/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml
index c7a38b6a57d..1be199da16b 100644
--- a/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml
+++ b/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml
@@ -6,8 +6,10 @@ product_section: 'TBD'
product_stage: growth
product_group: activation
value_type: number
-status: active
-milestone: "13.12"
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131860
+milestone_removed: '16.5'
+milestone: '13.12'
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
time_frame: all
data_source: database
@@ -16,9 +18,9 @@ options:
track: create
series: 1
distribution:
-- ce
-- ee
+ - ce
+ - ee
tier:
-- free
-- premium
-- ultimate
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml b/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml
index 7408554e50f..b631a50eea7 100644
--- a/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml
@@ -6,8 +6,10 @@ product_section: 'TBD'
product_stage: growth
product_group: activation
value_type: number
-status: active
-milestone: "13.12"
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131860
+milestone_removed: '16.5'
+milestone: '13.12'
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
time_frame: all
data_source: database
@@ -16,9 +18,9 @@ options:
track: create
series: 1
distribution:
-- ce
-- ee
+ - ce
+ - ee
tier:
-- free
-- premium
-- ultimate
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml b/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml
index 74a7b179acf..21b3f78552c 100644
--- a/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml
+++ b/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml
@@ -6,8 +6,10 @@ product_section: 'TBD'
product_stage: growth
product_group: activation
value_type: number
-status: active
-milestone: "13.12"
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131860
+milestone_removed: '16.5'
+milestone: '13.12'
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
time_frame: all
data_source: database
@@ -16,9 +18,9 @@ options:
track: create
series: 2
distribution:
-- ce
-- ee
+ - ce
+ - ee
tier:
-- free
-- premium
-- ultimate
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml b/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml
index 221c16450fc..b0edc023a51 100644
--- a/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml
@@ -6,8 +6,10 @@ product_section: 'TBD'
product_stage: growth
product_group: activation
value_type: number
-status: active
-milestone: "13.12"
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131860
+milestone_removed: '16.5'
+milestone: '13.12'
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
time_frame: all
data_source: database
@@ -16,9 +18,9 @@ options:
track: create
series: 2
distribution:
-- ce
-- ee
+ - ce
+ - ee
tier:
-- free
-- premium
-- ultimate
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml b/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml
index 2ca26cca60a..06d8c20596e 100644
--- a/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml
+++ b/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml
@@ -6,8 +6,10 @@ product_section: 'TBD'
product_stage: growth
product_group: activation
value_type: number
-status: active
-milestone: "13.12"
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131860
+milestone_removed: '16.5'
+milestone: '13.12'
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
time_frame: all
data_source: database
@@ -16,9 +18,9 @@ options:
track: verify
series: 0
distribution:
-- ce
-- ee
+ - ce
+ - ee
tier:
-- free
-- premium
-- ultimate
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml b/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml
index 403e58a0bb9..0ec0ff54c07 100644
--- a/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml
@@ -6,8 +6,10 @@ product_section: 'TBD'
product_stage: growth
product_group: activation
value_type: number
-status: active
-milestone: "13.12"
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131860
+milestone_removed: '16.5'
+milestone: '13.12'
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
time_frame: all
data_source: database
@@ -16,9 +18,9 @@ options:
track: verify
series: 0
distribution:
-- ce
-- ee
+ - ce
+ - ee
tier:
-- free
-- premium
-- ultimate
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml b/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml
index b1370f700a2..170f8ff6c8a 100644
--- a/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml
+++ b/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml
@@ -6,8 +6,10 @@ product_section: 'TBD'
product_stage: growth
product_group: activation
value_type: number
-status: active
-milestone: "13.12"
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131860
+milestone_removed: '16.5'
+milestone: '13.12'
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
time_frame: all
data_source: database
@@ -16,9 +18,9 @@ options:
track: verify
series: 1
distribution:
-- ce
-- ee
+ - ce
+ - ee
tier:
-- free
-- premium
-- ultimate
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml b/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml
index eac2a9fd27f..0d53136ec67 100644
--- a/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml
@@ -6,8 +6,10 @@ product_section: 'TBD'
product_stage: growth
product_group: activation
value_type: number
-status: active
-milestone: "13.12"
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131860
+milestone_removed: '16.5'
+milestone: '13.12'
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
time_frame: all
data_source: database
@@ -16,9 +18,9 @@ options:
track: verify
series: 1
distribution:
-- ce
-- ee
+ - ce
+ - ee
tier:
-- free
-- premium
-- ultimate
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml b/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml
index f8541ab06e7..57ae962b75b 100644
--- a/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml
+++ b/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml
@@ -6,8 +6,10 @@ product_section: 'TBD'
product_stage: growth
product_group: activation
value_type: number
-status: active
-milestone: "13.12"
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131860
+milestone_removed: '16.5'
+milestone: '13.12'
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
time_frame: all
data_source: database
@@ -16,9 +18,9 @@ options:
track: verify
series: 2
distribution:
-- ce
-- ee
+ - ce
+ - ee
tier:
-- free
-- premium
-- ultimate
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml b/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml
index 9344152603f..43aa1ea6cff 100644
--- a/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml
@@ -6,8 +6,10 @@ product_section: 'TBD'
product_stage: growth
product_group: activation
value_type: number
-status: active
-milestone: "13.12"
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131860
+milestone_removed: '16.5'
+milestone: '13.12'
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
time_frame: all
data_source: database
@@ -16,9 +18,9 @@ options:
track: verify
series: 2
distribution:
-- ce
-- ee
+ - ce
+ - ee
tier:
-- free
-- premium
-- ultimate
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml b/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml
index f2e5aa5d861..dd037658198 100644
--- a/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml
+++ b/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml
@@ -6,8 +6,10 @@ product_section: 'TBD'
product_stage: growth
product_group: activation
value_type: number
-status: active
-milestone: "13.12"
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131860
+milestone_removed: '16.5'
+milestone: '13.12'
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
time_frame: all
data_source: database
@@ -16,9 +18,9 @@ options:
track: trial
series: 0
distribution:
-- ce
-- ee
+ - ce
+ - ee
tier:
-- free
-- premium
-- ultimate
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml b/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml
index 3330c77accf..d2df99c0cce 100644
--- a/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml
@@ -6,8 +6,10 @@ product_section: 'TBD'
product_stage: growth
product_group: activation
value_type: number
-status: active
-milestone: "13.12"
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131860
+milestone_removed: '16.5'
+milestone: '13.12'
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
time_frame: all
data_source: database
@@ -16,9 +18,9 @@ options:
track: trial
series: 0
distribution:
-- ce
-- ee
+ - ce
+ - ee
tier:
-- free
-- premium
-- ultimate
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml b/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml
index 22ed95ec462..666065045f3 100644
--- a/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml
+++ b/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml
@@ -6,8 +6,10 @@ product_section: 'TBD'
product_stage: growth
product_group: activation
value_type: number
-status: active
-milestone: "13.12"
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131860
+milestone_removed: '16.5'
+milestone: '13.12'
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
time_frame: all
data_source: database
@@ -16,9 +18,9 @@ options:
track: trial
series: 1
distribution:
-- ce
-- ee
+ - ce
+ - ee
tier:
-- free
-- premium
-- ultimate
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml b/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml
index d75875d60f6..fb2505fc30a 100644
--- a/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml
@@ -6,8 +6,10 @@ product_section: 'TBD'
product_stage: growth
product_group: activation
value_type: number
-status: active
-milestone: "13.12"
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131860
+milestone_removed: '16.5'
+milestone: '13.12'
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
time_frame: all
data_source: database
@@ -16,9 +18,9 @@ options:
track: trial
series: 1
distribution:
-- ce
-- ee
+ - ce
+ - ee
tier:
-- free
-- premium
-- ultimate
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml b/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml
index 31d6c45b180..31f4e8154ef 100644
--- a/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml
+++ b/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml
@@ -6,8 +6,10 @@ product_section: 'TBD'
product_stage: growth
product_group: activation
value_type: number
-status: active
-milestone: "13.12"
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131860
+milestone_removed: '16.5'
+milestone: '13.12'
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
time_frame: all
data_source: database
@@ -16,9 +18,9 @@ options:
track: trial
series: 2
distribution:
-- ce
-- ee
+ - ce
+ - ee
tier:
-- free
-- premium
-- ultimate
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml b/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml
index 09269c37e88..f69e61b9a85 100644
--- a/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml
@@ -6,8 +6,10 @@ product_section: 'TBD'
product_stage: growth
product_group: activation
value_type: number
-status: active
-milestone: "13.12"
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131860
+milestone_removed: '16.5'
+milestone: '13.12'
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
time_frame: all
data_source: database
@@ -16,9 +18,9 @@ options:
track: trial
series: 2
distribution:
-- ce
-- ee
+ - ce
+ - ee
tier:
-- free
-- premium
-- ultimate
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml b/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml
index 165af6ee5a9..3ebd0e96074 100644
--- a/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml
+++ b/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml
@@ -6,8 +6,10 @@ product_section: 'TBD'
product_stage: growth
product_group: activation
value_type: number
-status: active
-milestone: "13.12"
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131860
+milestone_removed: '16.5'
+milestone: '13.12'
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
time_frame: all
data_source: database
@@ -16,9 +18,9 @@ options:
track: team
series: 0
distribution:
-- ce
-- ee
+ - ce
+ - ee
tier:
-- free
-- premium
-- ultimate
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml b/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml
index f40cfd85c4f..a6533d7abc8 100644
--- a/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml
@@ -6,8 +6,10 @@ product_section: 'TBD'
product_stage: growth
product_group: activation
value_type: number
-status: active
-milestone: "13.12"
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131860
+milestone_removed: '16.5'
+milestone: '13.12'
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
time_frame: all
data_source: database
@@ -16,9 +18,9 @@ options:
track: team
series: 0
distribution:
-- ce
-- ee
+ - ce
+ - ee
tier:
-- free
-- premium
-- ultimate
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml b/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml
index 47ab4dcd046..0750bfae82d 100644
--- a/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml
+++ b/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml
@@ -6,8 +6,10 @@ product_section: 'TBD'
product_stage: growth
product_group: activation
value_type: number
-status: active
-milestone: "13.12"
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131860
+milestone_removed: '16.5'
+milestone: '13.12'
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
time_frame: all
data_source: database
@@ -16,9 +18,9 @@ options:
track: team
series: 1
distribution:
-- ce
-- ee
+ - ce
+ - ee
tier:
-- free
-- premium
-- ultimate
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml b/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml
index 03c15303678..3a74dd6870a 100644
--- a/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml
@@ -6,8 +6,10 @@ product_section: 'TBD'
product_stage: growth
product_group: activation
value_type: number
-status: active
-milestone: "13.12"
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131860
+milestone_removed: '16.5'
+milestone: '13.12'
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
time_frame: all
data_source: database
@@ -16,9 +18,9 @@ options:
track: team
series: 1
distribution:
-- ce
-- ee
+ - ce
+ - ee
tier:
-- free
-- premium
-- ultimate
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml b/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml
index d0a6eeb8fb8..351c4649003 100644
--- a/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml
+++ b/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml
@@ -6,8 +6,10 @@ product_section: 'TBD'
product_stage: growth
product_group: activation
value_type: number
-status: active
-milestone: "13.12"
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131860
+milestone_removed: '16.5'
+milestone: '13.12'
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
time_frame: all
data_source: database
@@ -16,9 +18,9 @@ options:
track: team
series: 2
distribution:
-- ce
-- ee
+ - ce
+ - ee
tier:
-- free
-- premium
-- ultimate
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml b/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml
index 8bee7df8fbf..a8cf20317f7 100644
--- a/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml
@@ -6,8 +6,10 @@ product_section: 'TBD'
product_stage: growth
product_group: activation
value_type: number
-status: active
-milestone: "13.12"
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131860
+milestone_removed: '16.5'
+milestone: '13.12'
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56752
time_frame: all
data_source: database
@@ -16,9 +18,9 @@ options:
track: team
series: 2
distribution:
-- ce
-- ee
+ - ce
+ - ee
tier:
-- free
-- premium
-- ultimate
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_all/20210727095918_in_product_marketing_email_team_short_0_cta_clicked.yml b/config/metrics/counts_all/20210727095918_in_product_marketing_email_team_short_0_cta_clicked.yml
index 42eee999b46..70f486412f2 100644
--- a/config/metrics/counts_all/20210727095918_in_product_marketing_email_team_short_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210727095918_in_product_marketing_email_team_short_0_cta_clicked.yml
@@ -5,8 +5,10 @@ product_section: growth
product_stage: growth
product_group: activation
value_type: number
-status: active
-milestone: "14.2"
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131860
+milestone_removed: '16.5'
+milestone: '14.2'
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66854
time_frame: all
data_source: database
@@ -16,9 +18,9 @@ options:
series: 0
data_category: optional
distribution:
-- ce
-- ee
+ - ce
+ - ee
tier:
-- free
-- premium
-- ultimate
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_all/20210727095923_in_product_marketing_email_team_short_0_sent.yml b/config/metrics/counts_all/20210727095923_in_product_marketing_email_team_short_0_sent.yml
index 5b4ce9572d4..62d4196d39a 100644
--- a/config/metrics/counts_all/20210727095923_in_product_marketing_email_team_short_0_sent.yml
+++ b/config/metrics/counts_all/20210727095923_in_product_marketing_email_team_short_0_sent.yml
@@ -5,8 +5,10 @@ product_section: growth
product_stage: growth
product_group: activation
value_type: number
-status: active
-milestone: "14.2"
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131860
+milestone_removed: '16.5'
+milestone: '14.2'
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66854
time_frame: all
data_source: database
@@ -16,9 +18,9 @@ options:
series: 0
data_category: optional
distribution:
-- ce
-- ee
+ - ce
+ - ee
tier:
-- free
-- premium
-- ultimate
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_all/20210727170553_in_product_marketing_email_trial_short_0_cta_clicked.yml b/config/metrics/counts_all/20210727170553_in_product_marketing_email_trial_short_0_cta_clicked.yml
index 5949772adb7..260c2b9bb33 100644
--- a/config/metrics/counts_all/20210727170553_in_product_marketing_email_trial_short_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210727170553_in_product_marketing_email_trial_short_0_cta_clicked.yml
@@ -5,8 +5,10 @@ product_section: growth
product_stage: growth
product_group: activation
value_type: number
-status: active
-milestone: "14.2"
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131860
+milestone_removed: '16.5'
+milestone: '14.2'
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66943
time_frame: all
data_source: database
@@ -16,9 +18,9 @@ options:
series: 0
data_category: optional
distribution:
-- ce
-- ee
+ - ce
+ - ee
tier:
-- free
-- premium
-- ultimate
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_all/20210727170558_in_product_marketing_email_trial_short_0_sent.yml b/config/metrics/counts_all/20210727170558_in_product_marketing_email_trial_short_0_sent.yml
index 42370e5b267..41f2d30f3c6 100644
--- a/config/metrics/counts_all/20210727170558_in_product_marketing_email_trial_short_0_sent.yml
+++ b/config/metrics/counts_all/20210727170558_in_product_marketing_email_trial_short_0_sent.yml
@@ -5,8 +5,10 @@ product_section: growth
product_stage: growth
product_group: activation
value_type: number
-status: active
-milestone: "14.2"
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131860
+milestone_removed: '16.5'
+milestone: '14.2'
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66943
time_frame: all
data_source: database
@@ -16,9 +18,9 @@ options:
series: 0
data_category: optional
distribution:
-- ce
-- ee
+ - ce
+ - ee
tier:
-- free
-- premium
-- ultimate
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_all/20210729140021_in_product_marketing_email_admin_verify_0_cta_clicked.yml b/config/metrics/counts_all/20210729140021_in_product_marketing_email_admin_verify_0_cta_clicked.yml
index 425b2346eff..1d5c3a07d07 100644
--- a/config/metrics/counts_all/20210729140021_in_product_marketing_email_admin_verify_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210729140021_in_product_marketing_email_admin_verify_0_cta_clicked.yml
@@ -5,8 +5,10 @@ product_section: growth
product_stage: growth
product_group: activation
value_type: number
-status: active
-milestone: "14.2"
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131860
+milestone_removed: '16.5'
+milestone: '14.2'
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67147
time_frame: all
data_source: database
@@ -16,9 +18,9 @@ options:
series: 0
data_category: optional
distribution:
-- ce
-- ee
+ - ce
+ - ee
tier:
-- free
-- premium
-- ultimate
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_all/20210729140423_in_product_marketing_email_admin_verify_0_sent.yml b/config/metrics/counts_all/20210729140423_in_product_marketing_email_admin_verify_0_sent.yml
index 1df94f95732..a594335f068 100644
--- a/config/metrics/counts_all/20210729140423_in_product_marketing_email_admin_verify_0_sent.yml
+++ b/config/metrics/counts_all/20210729140423_in_product_marketing_email_admin_verify_0_sent.yml
@@ -5,8 +5,10 @@ product_section: growth
product_stage: growth
product_group: activation
value_type: number
-status: active
-milestone: "14.2"
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131860
+milestone_removed: '16.5'
+milestone: '14.2'
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67147
time_frame: all
data_source: database
@@ -16,9 +18,9 @@ options:
series: 0
data_category: optional
distribution:
-- ce
-- ee
+ - ce
+ - ee
tier:
-- free
-- premium
-- ultimate
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml b/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml
index 21cbb828118..2c990d82154 100644
--- a/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml
+++ b/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml
@@ -1,9 +1,9 @@
---
key_path: usage_activity_by_stage.manage.user_auth_by_provider
description: Number of unique user logins using two factor authentication for available providers
-product_section: dev
-product_stage: manage
-product_group: authentication_and_authorization
+product_section: sec
+product_stage: govern
+product_group: authentication
value_type: object
status: active
milestone: "14.3"
diff --git a/config/metrics/counts_all/20220825232556_count_user_auth.yml b/config/metrics/counts_all/20220825232556_count_user_auth.yml
index 32cccc5ddcf..e520fd6bd9a 100644
--- a/config/metrics/counts_all/20220825232556_count_user_auth.yml
+++ b/config/metrics/counts_all/20220825232556_count_user_auth.yml
@@ -1,9 +1,9 @@
---
key_path: usage_activity_by_stage.manage.count_user_auth
description: Number of unique user logins
-product_section: dev
-product_stage: manage
-product_group: authentication_and_authorization
+product_section: sec
+product_stage: govern
+product_group: authentication
value_type: number
status: active
milestone: "15.4"
diff --git a/config/metrics/counts_all/20230725195335_i_code_review_saved_replies_count_use.yml b/config/metrics/counts_all/20230725195335_i_code_review_saved_replies_count_use.yml
index 40599af67c1..cf7aab39202 100644
--- a/config/metrics/counts_all/20230725195335_i_code_review_saved_replies_count_use.yml
+++ b/config/metrics/counts_all/20230725195335_i_code_review_saved_replies_count_use.yml
@@ -9,9 +9,9 @@ status: active
milestone: "16.3"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127442
time_frame: all
-data_source: redis
+data_source: internal_events
data_category: optional
-instrumentation_class: RedisMetric
+instrumentation_class: TotalCountMetric
performance_indicator_type: []
distribution:
- ce
@@ -21,5 +21,7 @@ tier:
- premium
- ultimate
options:
- event: use
- prefix: i_code_review_saved_replies
+ events:
+ - i_code_review_saved_replies_use
+events:
+ - name: i_code_review_saved_replies_use
diff --git a/config/metrics/counts_all/20230725200123_i_code_review_saved_replies_count_create.yml b/config/metrics/counts_all/20230725200123_i_code_review_saved_replies_count_create.yml
index 64cfcee0ef4..ffeb777fc55 100644
--- a/config/metrics/counts_all/20230725200123_i_code_review_saved_replies_count_create.yml
+++ b/config/metrics/counts_all/20230725200123_i_code_review_saved_replies_count_create.yml
@@ -9,9 +9,9 @@ status: active
milestone: "16.3"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/126884
time_frame: all
-data_source: redis
+data_source: internal_events
data_category: optional
-instrumentation_class: RedisMetric
+instrumentation_class: TotalCountMetric
performance_indicator_type: []
distribution:
- ce
@@ -21,5 +21,7 @@ tier:
- premium
- ultimate
options:
- event: create
- prefix: i_code_review_saved_replies
+ events:
+ - i_code_review_saved_replies_create
+events:
+ - name: i_code_review_saved_replies_create
diff --git a/config/metrics/counts_all/20230809084619_connected_agents.yml b/config/metrics/counts_all/20230809084619_connected_agents.yml
index 93d75329243..57a5dc2e253 100644
--- a/config/metrics/counts_all/20230809084619_connected_agents.yml
+++ b/config/metrics/counts_all/20230809084619_connected_agents.yml
@@ -12,8 +12,7 @@ time_frame: all
data_source: database
data_category: optional
instrumentation_class: CountConnectedAgentsMetric
-performance_indicator_type:
-- smau
+performance_indicator_type: []
distribution:
- ce
- ee
diff --git a/config/metrics/counts_all/20230809194308_i_code_review_saved_replies_use_in_mr.yml b/config/metrics/counts_all/20230809194308_i_code_review_saved_replies_use_in_mr.yml
index a12d694306e..506ad82f4f4 100644
--- a/config/metrics/counts_all/20230809194308_i_code_review_saved_replies_use_in_mr.yml
+++ b/config/metrics/counts_all/20230809194308_i_code_review_saved_replies_use_in_mr.yml
@@ -9,9 +9,9 @@ status: active
milestone: "16.3"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128821
time_frame: all
-data_source: redis
+data_source: internal_events
data_category: optional
-instrumentation_class: RedisMetric
+instrumentation_class: TotalCountMetric
performance_indicator_type: []
distribution:
- ce
@@ -21,5 +21,7 @@ tier:
- premium
- ultimate
options:
- event: use_in_mr
- prefix: i_code_review_saved_replies
+ events:
+ - i_code_review_saved_replies_use_in_mr
+events:
+ - name: i_code_review_saved_replies_use_in_mr
diff --git a/config/metrics/counts_all/20230815054809_i_code_review_saved_replies_use_in_other.yml b/config/metrics/counts_all/20230815054809_i_code_review_saved_replies_use_in_other.yml
index 0ffa90cf458..83fb5630d16 100644
--- a/config/metrics/counts_all/20230815054809_i_code_review_saved_replies_use_in_other.yml
+++ b/config/metrics/counts_all/20230815054809_i_code_review_saved_replies_use_in_other.yml
@@ -9,9 +9,9 @@ status: active
milestone: "16.3"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128822
time_frame: all
-data_source: redis
+data_source: internal_events
data_category: optional
-instrumentation_class: RedisMetric
+instrumentation_class: TotalCountMetric
performance_indicator_type: []
distribution:
- ce
@@ -21,5 +21,7 @@ tier:
- premium
- ultimate
options:
- event: use_in_other
- prefix: i_code_review_saved_replies
+ events:
+ - i_code_review_saved_replies_use_in_other
+events:
+ - name: i_code_review_saved_replies_use_in_other
diff --git a/config/metrics/license/20230926091801_db_enabled.yml b/config/metrics/license/20230926091801_db_enabled.yml
new file mode 100644
index 00000000000..0e4fc5231ee
--- /dev/null
+++ b/config/metrics/license/20230926091801_db_enabled.yml
@@ -0,0 +1,22 @@
+---
+key_path: container_registry_server.db_enabled
+description: Is the Container Registry metadata database enabled
+product_section: ops
+product_stage: package
+product_group: container_registry
+value_type: boolean
+status: active
+milestone: "16.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132550
+time_frame: none
+data_source: database
+data_category: operational
+instrumentation_class: ContainerRegistryDbEnabledMetric
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/schema.json b/config/metrics/schema.json
index 3d081a8bca7..fe53b92f7de 100644
--- a/config/metrics/schema.json
+++ b/config/metrics/schema.json
@@ -92,8 +92,7 @@
"items": {
"type": "object",
"required": [
- "name",
- "unique"
+ "name"
],
"properties": {
"name": {
@@ -186,9 +185,6 @@
]
}
},
- "skip_validation": {
- "type": "boolean"
- },
"value_json_schema": {
"type": "string"
}
diff --git a/config/metrics/settings/20210204124904_gravatar_enabled.yml b/config/metrics/settings/20210204124904_gravatar_enabled.yml
index 932151ca37a..0364fb9f6ac 100644
--- a/config/metrics/settings/20210204124904_gravatar_enabled.yml
+++ b/config/metrics/settings/20210204124904_gravatar_enabled.yml
@@ -2,9 +2,9 @@
data_category: optional
key_path: gravatar_enabled
description: Whether gravatar is enabled
-product_section: dev
-product_stage: manage
-product_group: authentication_and_authorization
+product_section: sec
+product_stage: govern
+product_group: authentication
value_type: boolean
status: active
time_frame: none
diff --git a/config/metrics/settings/20210204124906_ldap_enabled.yml b/config/metrics/settings/20210204124906_ldap_enabled.yml
index 3a5d6335693..d5f682912f5 100644
--- a/config/metrics/settings/20210204124906_ldap_enabled.yml
+++ b/config/metrics/settings/20210204124906_ldap_enabled.yml
@@ -2,9 +2,9 @@
data_category: optional
key_path: ldap_enabled
description: Whether LDAP is enabled
-product_section: dev
-product_stage: manage
-product_group: authentication_and_authorization
+product_section: sec
+product_stage: govern
+product_group: authentication
value_type: boolean
status: active
time_frame: none
diff --git a/config/metrics/settings/20210204124910_omniauth_enabled.yml b/config/metrics/settings/20210204124910_omniauth_enabled.yml
index 810ded396ca..811202f8515 100644
--- a/config/metrics/settings/20210204124910_omniauth_enabled.yml
+++ b/config/metrics/settings/20210204124910_omniauth_enabled.yml
@@ -2,9 +2,9 @@
data_category: optional
key_path: omniauth_enabled
description: Whether OmniAuth is enabled
-product_section: dev
-product_stage: manage
-product_group: authentication_and_authorization
+product_section: sec
+product_stage: govern
+product_group: authentication
value_type: boolean
status: active
time_frame: none
diff --git a/config/metrics/settings/20210204124918_signup_enabled.yml b/config/metrics/settings/20210204124918_signup_enabled.yml
index 0fc1e768de1..f9e47064771 100644
--- a/config/metrics/settings/20210204124918_signup_enabled.yml
+++ b/config/metrics/settings/20210204124918_signup_enabled.yml
@@ -2,9 +2,9 @@
data_category: optional
key_path: signup_enabled
description: Whether public signup is enabled
-product_section: dev
-product_stage: manage
-product_group: authentication_and_authorization
+product_section: sec
+product_stage: govern
+product_group: authentication
value_type: boolean
status: active
time_frame: none
diff --git a/config/object_store_settings.rb b/config/object_store_settings.rb
index 283cd952c04..4e9a7148e15 100644
--- a/config/object_store_settings.rb
+++ b/config/object_store_settings.rb
@@ -50,6 +50,24 @@ class ObjectStoreSettings
[bucket, prefix]
end
+ def self.enabled_endpoint_uris
+ SUPPORTED_TYPES.filter_map do |type|
+ section_setting = Gitlab.config.try(type)
+
+ next unless section_setting && section_setting['enabled']
+
+ object_store_setting = section_setting['object_store']
+
+ next unless object_store_setting && object_store_setting['enabled']
+
+ endpoint = object_store_setting.dig('connection', 'endpoint')
+
+ next unless endpoint
+
+ URI(endpoint)
+ end.uniq
+ end
+
def initialize(settings)
@settings = settings
end
diff --git a/config/puma.rb.example b/config/puma.rb.example
index d664986174b..65c817bb2d8 100644
--- a/config/puma.rb.example
+++ b/config/puma.rb.example
@@ -81,15 +81,10 @@ log_formatter do |str|
json_formatter.call(str)
end
-lowlevel_error_handler do |ex, env|
- if Raven.configuration.capture_allowed?
- Raven.capture_exception(ex, tags: { 'handler': 'puma_low_level' }, extra: { puma_env: env })
- end
+require_relative "/home/git/gitlab/lib/gitlab/puma/error_handler"
- if Sentry.configuration.sending_allowed?
- Sentry.capture_exception(ex, tags: { 'handler': 'puma_low_level' }, extra: { puma_env: env })
- end
+error_handler = Gitlab::Puma::ErrorHandler.new(ENV['RAILS_ENV'] == 'production')
- # note the below is just a Rack response
- [500, {}, ["An error has occurred and reported in the system's low-level error handler."]]
+lowlevel_error_handler do |ex, env, status_code|
+ error_handler.execute(ex, env, status_code)
end
diff --git a/config/routes.rb b/config/routes.rb
index 663828670dd..82b2ef84a64 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -62,9 +62,8 @@ InitializerConnections.raise_if_new_database_connection do
# Sign up
scope path: '/users/sign_up', module: :registrations, as: :users_sign_up do
- resource :welcome, only: [:show, :update], controller: 'welcome'
-
Gitlab.ee do
+ resource :welcome, only: [:show, :update], controller: 'welcome'
resource :company, only: [:new, :create], controller: 'company'
resources :groups, only: [:new, :create]
end
@@ -282,6 +281,7 @@ InitializerConnections.raise_if_new_database_connection do
draw :explore
draw :admin
draw :dashboard
+ draw :identity_verification
draw :user
draw :project
draw :unmatched_project
diff --git a/config/routes/group.rb b/config/routes/group.rb
index 87e885e59a2..e1185b15d12 100644
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
@@ -78,6 +78,8 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
post :toggle_subscription, on: :member
end
+ resources :custom_emoji, only: [:index, :new], action: :index
+
resources :packages, only: [:index, :show]
resources :milestones, constraints: { id: %r{[^/]+} } do
@@ -129,11 +131,6 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
resources :container_registries, only: [:index, :show], controller: 'registry/repositories'
resource :dependency_proxy, only: [:show, :update]
- namespace :observability do
- get 'explore'
- get 'datasources'
- end
-
namespace :harbor do
resources :repositories, only: [:index, :show], constraints: { id: %r{[a-zA-Z./:0-9_\-]+} } do
resources :artifacts, only: [:index] do
diff --git a/config/routes/organizations.rb b/config/routes/organizations.rb
index 6f44eeb0d82..d53cfdf1a4e 100644
--- a/config/routes/organizations.rb
+++ b/config/routes/organizations.rb
@@ -4,9 +4,13 @@ resources(
:organizations,
only: [:show, :index, :new],
param: :organization_path,
- controller: 'organizations/organizations'
+ module: :organizations
) do
member do
get :groups_and_projects
+
+ resource :settings, only: [], as: :settings_organization do
+ get :general
+ end
end
end
diff --git a/config/routes/project.rb b/config/routes/project.rb
index e7242f1ecee..8ed8574d0cc 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -343,10 +343,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
get 'alert_management/:id', to: 'alert_management#details', as: 'alert_management_alert'
- get 'work_items/*work_items_path' => 'work_items#index', as: :work_items
- get 'work_items/*work_items_path' => 'work_items#index', as: :work_item
-
- resources :work_items, only: [] do
+ resources :work_items, only: [:show], param: :iid do
collection do
post :import_csv
post 'import_csv/authorize', to: 'work_items#authorize'
@@ -464,7 +461,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
namespace :ml do
resources :experiments, only: [:index, :show, :destroy], controller: 'experiments', param: :iid
resources :candidates, only: [:show, :destroy], controller: 'candidates', param: :iid
- resources :models, only: [:index], controller: 'models'
+ resources :models, only: [:index, :show], controller: 'models', param: :model_id
end
namespace :service_desk do
diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml
index 05626a2b8b8..1f0b4840a8e 100644
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -81,12 +81,28 @@
- 1
- - bitbucket_import_advance_stage
- 1
+- - bitbucket_import_import_issue
+ - 1
+- - bitbucket_import_import_issue_notes
+ - 1
+- - bitbucket_import_import_lfs_object
+ - 1
- - bitbucket_import_import_pull_request
- 1
+- - bitbucket_import_import_pull_request_notes
+ - 1
- - bitbucket_import_stage_finish_import
- 1
+- - bitbucket_import_stage_import_issues
+ - 1
+- - bitbucket_import_stage_import_issues_notes
+ - 1
+- - bitbucket_import_stage_import_lfs_objects
+ - 1
- - bitbucket_import_stage_import_pull_requests
- 1
+- - bitbucket_import_stage_import_pull_requests_notes
+ - 1
- - bitbucket_import_stage_import_repository
- 1
- - bitbucket_server_import_advance_stage
@@ -147,9 +163,11 @@
- 1
- - ci_runners_process_runner_version_update
- 1
+- - ci_unlock_pipelines_in_queue
+ - 1
- - ci_upstream_projects_subscriptions_cleanup
- 1
-- - click_house_events_sync
+- - click_house_ci_finished_builds_sync
- 1
- - cluster_agent
- 1
@@ -159,6 +177,8 @@
- 1
- - compliance_management_merge_requests_compliance_violations
- 1
+- - compliance_management_pending_status_check
+ - 1
- - compliance_management_standards_gitlab_at_least_two_approvals
- 1
- - compliance_management_standards_gitlab_base
@@ -257,6 +277,8 @@
- 1
- - environments_canary_ingress_update
- 1
+- - environments_stop_job_failed
+ - 1
- - environments_stop_job_success
- 1
- - epics
@@ -285,8 +307,8 @@
- 1
- - gitlab_performance_bar_stats
- 1
-- - gitlab_shell
- - 2
+- - gitlab_subscriptions_add_on_purchases_bulk_refresh_user_assignments
+ - 1
- - gitlab_subscriptions_add_on_purchases_cleanup_user_add_on_assignment
- 1
- - gitlab_subscriptions_add_on_purchases_refresh_user_assignments
@@ -313,6 +335,8 @@
- 1
- - groups_enterprise_users_associate
- 1
+- - groups_enterprise_users_bulk_associate_by_domain
+ - 1
- - groups_enterprise_users_disassociate
- 1
- - groups_export_memberships
@@ -361,6 +385,8 @@
- 1
- - issuable_label_links_destroy
- 1
+- - issuable_related_links_create
+ - 1
- - issuables_clear_groups_issue_counter
- 1
- - issues_close
@@ -383,8 +409,12 @@
- 1
- - llm_embedding_gitlab_documentation_set_embeddings_on_the_record
- 1
+- - llm_namespace_access_cache_reset
+ - 1
- - llm_tanuki_bot_update
- 1
+- - llm_vertex_ai_access_token_refresh
+ - 1
- - mail_scheduler
- 2
- - mailers
@@ -443,6 +473,8 @@
- 1
- - namespaces_process_sync_events
- 1
+- - namespaces_storage_usage_export
+ - 1
- - namespaces_sync_namespace_name
- 1
- - namespaces_update_root_statistics
@@ -625,6 +657,8 @@
- 1
- - security_scan_execution_policies_rule_schedule
- 1
+- - security_scan_result_policies_sync_any_merge_request_approval_rules
+ - 1
- - security_scan_result_policies_sync_opened_merge_requests
- 1
- - security_scan_result_policies_sync_project
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 1ee681857a6..8b45b25a328 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -359,7 +359,7 @@ module.exports = {
use: [],
},
{
- test: /(@cubejs-client\/vue).*\.(js)?$/,
+ test: /(@cubejs-client\/(vue|core)).*\.(js)?$/,
include: /node_modules/,
loader: 'babel-loader',
},
@@ -429,7 +429,7 @@ module.exports = {
loader: 'graphql-tag/loader',
},
{
- test: /icons\.svg$/,
+ test: /@gitlab\/svgs\/.+\.svg$/,
loader: 'file-loader',
options: {
name: '[name].[contenthash:8].[ext]',
@@ -437,7 +437,7 @@ module.exports = {
},
{
test: /\.svg$/,
- exclude: /icons\.svg$/,
+ exclude: /@gitlab\/svgs\/.+\.svg$/,
resourceQuery: /url/,
loader: 'file-loader',
options: {