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.rb2
-rw-r--r--config/feature_categories.yml4
-rw-r--r--config/feature_flags/development/abuse_report_notes.yml (renamed from config/feature_flags/development/ai_assist_api.yml)10
-rw-r--r--config/feature_flags/development/access_token_pagination.yml2
-rw-r--r--config/feature_flags/development/activity_filter_has_mr.yml2
-rw-r--r--config/feature_flags/development/activity_filter_has_remediations.yml8
-rw-r--r--config/feature_flags/development/ambiguous_ref_modal.yml (renamed from config/feature_flags/development/explain_code_vertex_ai.yml)8
-rw-r--r--config/feature_flags/development/auto_devops_banner_disabled.yml2
-rw-r--r--config/feature_flags/development/blob_blame_info.yml (renamed from config/feature_flags/development/data_transfer_monitoring_mock_data.yml)8
-rw-r--r--config/feature_flags/development/build_service_proxy.yml4
-rw-r--r--config/feature_flags/development/bulk_import_deferred_workers.yml (renamed from config/feature_flags/development/jira_dvcs_end_of_life_amnesty.yml)8
-rw-r--r--config/feature_flags/development/bulk_import_details_page.yml (renamed from config/feature_flags/development/composer_use_ssh_source_urls.yml)10
-rw-r--r--config/feature_flags/development/by_pass_two_factor_for_current_session.yml2
-rw-r--r--config/feature_flags/development/ci_catalog_create_metadata.yml (renamed from config/feature_flags/development/ci_fix_performance_pipelines_json_endpoint.yml)8
-rw-r--r--config/feature_flags/development/ci_job_artifacts_backlog_large_loop_limit.yml2
-rw-r--r--config/feature_flags/development/ci_require_credit_card_on_free_plan.yml2
-rw-r--r--config/feature_flags/development/ci_require_credit_card_on_trial_plan.yml2
-rw-r--r--config/feature_flags/development/ci_stop_unlock_pipelines.yml8
-rw-r--r--config/feature_flags/development/ci_unlock_non_successful_pipelines.yml (renamed from config/feature_flags/development/admin_group_member.yml)8
-rw-r--r--config/feature_flags/development/code_suggestions_for_instance_admin_enabled.yml2
-rw-r--r--config/feature_flags/development/code_tasks.yml (renamed from config/feature_flags/development/runners_dashboard.yml)10
-rw-r--r--config/feature_flags/development/compare_project_authorization_linear_cte.yml2
-rw-r--r--config/feature_flags/development/container_registry_protected_containers.yml8
-rw-r--r--config/feature_flags/development/create_embeddings_with_vertex_ai.yml8
-rw-r--r--config/feature_flags/development/create_project_subscription_graphql_endpoint.yml8
-rw-r--r--config/feature_flags/development/custom_roles_in_members_page.yml2
-rw-r--r--config/feature_flags/development/custom_roles_ui_saas.yml2
-rw-r--r--config/feature_flags/development/disable_unsafe_regexp.yml2
-rw-r--r--config/feature_flags/development/display_cost_factored_storage_size_on_project_pages.yml8
-rw-r--r--config/feature_flags/development/do_not_run_safety_net_auth_refresh_jobs.yml2
-rw-r--r--config/feature_flags/development/forti_authenticator.yml2
-rw-r--r--config/feature_flags/development/forti_token_cloud.yml2
-rw-r--r--config/feature_flags/development/frecent_namespaces_suggestions.yml (renamed from config/feature_flags/development/super_sidebar_logged_out.yml)8
-rw-r--r--config/feature_flags/development/github_importer_raise_max_interruptions.yml8
-rw-r--r--config/feature_flags/development/global_ci_catalog.yml8
-rw-r--r--config/feature_flags/development/global_dependency_scanning_on_advisory_ingestion.yml8
-rw-r--r--config/feature_flags/development/group_multi_select_tokens.yml (renamed from config/feature_flags/development/issue_assignees_widget.yml)10
-rw-r--r--config/feature_flags/development/import_fallback_to_db_empty_cache.yml (renamed from config/feature_flags/development/bulk_import_idempotent_workers.yml)8
-rw-r--r--config/feature_flags/development/increase_jira_import_issues_timeout.yml (renamed from config/feature_flags/development/saved_replies.yml)8
-rw-r--r--config/feature_flags/development/inherit_higher_access_levels_no_cross_join.yml2
-rw-r--r--config/feature_flags/development/invert_omniauth_args_merging.yml8
-rw-r--r--config/feature_flags/development/k8s_watch_api.yml (renamed from config/feature_flags/development/create_deployment_only_for_processable_jobs.yml)6
-rw-r--r--config/feature_flags/development/linear_project_authorization.yml2
-rw-r--r--config/feature_flags/development/log_git_streaming_audit_events.yml (renamed from config/feature_flags/development/verify_push_rules_for_first_commit.yml)10
-rw-r--r--config/feature_flags/development/manage_project_access_tokens.yml4
-rw-r--r--config/feature_flags/development/mastodon_social_ui.yml (renamed from config/feature_flags/development/user_profile_overflow_menu_vue.yml)8
-rw-r--r--config/feature_flags/development/member_expiring_email_notification.yml2
-rw-r--r--config/feature_flags/development/mr_request_changes.yml (renamed from config/feature_flags/development/ai_self_discover.yml)10
-rw-r--r--config/feature_flags/development/new_pipeline_graph.yml (renamed from config/feature_flags/development/coop_header.yml)8
-rw-r--r--config/feature_flags/development/nuget_duplicates_option.yml8
-rw-r--r--config/feature_flags/development/observability_metrics.yml8
-rw-r--r--config/feature_flags/development/oidc_issuer_url.yml (renamed from config/feature_flags/development/ci_variable_drawer.yml)8
-rw-r--r--config/feature_flags/development/only_highlight_discussions_requested.yml8
-rw-r--r--config/feature_flags/development/openai_experimentation.yml8
-rw-r--r--config/feature_flags/development/order_builds_for_group_runner.yml2
-rw-r--r--config/feature_flags/development/personal_snippet_reference_filters.yml2
-rw-r--r--config/feature_flags/development/preserve_unchanged_markdown.yml2
-rw-r--r--config/feature_flags/development/product_analytics_usage_quota.yml8
-rw-r--r--config/feature_flags/development/project_overwrite_service_tracking.yml2
-rw-r--r--config/feature_flags/development/project_tool_filter_with_scanner_name.yml (renamed from config/feature_flags/development/vulnerability_report_grouping.yml)8
-rw-r--r--config/feature_flags/development/rate_limit_oauth_api.yml2
-rw-r--r--config/feature_flags/development/reduce_duplicate_job_key_ttl.yml (renamed from config/feature_flags/development/use_primary_store_as_default_for_action_cable.yml)8
-rw-r--r--config/feature_flags/development/reject_unsigned_commits_by_gitlab.yml2
-rw-r--r--config/feature_flags/development/remove_mr_blocking_constraints.yml (renamed from config/feature_flags/development/merge_request_refs_cleanup.yml)10
-rw-r--r--config/feature_flags/development/replicate_object_pool_on_move.yml2
-rw-r--r--config/feature_flags/development/restrict_ci_job_token_for_public_and_internal_projects.yml8
-rw-r--r--config/feature_flags/development/restrict_pipeline_cancellation_by_role.yml (renamed from config/feature_flags/development/reduced_build_attributes_list_for_rules.yml)8
-rw-r--r--config/feature_flags/development/restyle_login_page.yml2
-rw-r--r--config/feature_flags/development/rugged_commit_is_ancestor.yml8
-rw-r--r--config/feature_flags/development/rugged_commit_tree_entry.yml8
-rw-r--r--config/feature_flags/development/rugged_find_commit.yml8
-rw-r--r--config/feature_flags/development/rugged_list_commits_by_oid.yml8
-rw-r--r--config/feature_flags/development/rugged_tree_entries.yml8
-rw-r--r--config/feature_flags/development/rugged_tree_entry.yml8
-rw-r--r--config/feature_flags/development/search_issues_hide_archived_projects.yml8
-rw-r--r--config/feature_flags/development/search_merge_requests_hide_archived_projects.yml8
-rw-r--r--config/feature_flags/development/search_notes_hide_archived_projects.yml9
-rw-r--r--config/feature_flags/development/service_accounts_crud.yml2
-rw-r--r--config/feature_flags/development/service_desk_new_note_email_native_attachments.yml8
-rw-r--r--config/feature_flags/development/set_feature_flag_service.yml2
-rw-r--r--config/feature_flags/development/source_editor_toolbar.yml2
-rw-r--r--config/feature_flags/development/sourcegraph.yml2
-rw-r--r--config/feature_flags/development/specialized_worker_for_group_lock_update_auth_recalculation.yml2
-rw-r--r--config/feature_flags/development/summarize_notes_with_anthropic.yml8
-rw-r--r--config/feature_flags/development/super_sidebar_nav_enrolled.yml8
-rw-r--r--config/feature_flags/development/support_group_level_merge_checks_setting.yml2
-rw-r--r--config/feature_flags/development/two_factor_for_cli.yml2
-rw-r--r--config/feature_flags/development/unbatch_graphql_queries.yml8
-rw-r--r--config/feature_flags/development/use_embeddings_with_vertex.yml8
-rw-r--r--config/feature_flags/development/use_gitlab_http_v2.yml2
-rw-r--r--config/feature_flags/development/use_new_rule_finalize_approach.yml8
-rw-r--r--config/feature_flags/development/use_pipeline_wizard_for_pages.yml8
-rw-r--r--config/feature_flags/development/use_primary_and_secondary_stores_for_shared_state.yml (renamed from config/feature_flags/development/use_primary_and_secondary_stores_for_action_cable.yml)8
-rw-r--r--config/feature_flags/development/use_primary_store_as_default_for_shared_state.yml8
-rw-r--r--config/feature_flags/development/use_repository_list_tags_on_graphql.yml (renamed from config/feature_flags/development/jwt_auth_space_delimited_scopes.yml)6
-rw-r--r--config/feature_flags/development/use_sql_functions_for_primary_key_lookups.yml8
-rw-r--r--config/feature_flags/development/value_stream_dashboard_on_off_setting.yml8
-rw-r--r--config/feature_flags/development/vscode_web_ide.yml2
-rw-r--r--config/feature_flags/development/webauthn_without_totp.yml2
-rw-r--r--config/feature_flags/development/widget_pipeline_pass_subscription_update.yml8
-rw-r--r--config/feature_flags/development/wiki_front_matter.yml4
-rw-r--r--config/feature_flags/development/wiki_front_matter_title.yml (renamed from config/feature_flags/development/print_wiki.yml)10
-rw-r--r--config/feature_flags/experiment/disable_network_graph_notes_count.yml8
-rw-r--r--config/feature_flags/experiment/ios_specific_templates.yml8
-rw-r--r--config/feature_flags/ops/automatic_lock_writes_on_partition_tables.yml8
-rw-r--r--config/feature_flags/ops/block_password_auth_for_saml_users.yml2
-rw-r--r--config/feature_flags/ops/code_suggestions_tokens_api.yml2
-rw-r--r--config/feature_flags/ops/enforce_ci_builds_pagination_limit.yml8
-rw-r--r--config/feature_flags/ops/enforce_memory_watchdog.yml2
-rw-r--r--config/feature_flags/ops/report_heap_dumps.yml2
-rw-r--r--config/feature_flags/ops/report_jemalloc_stats.yml2
-rw-r--r--config/feature_flags/ops/suggested_reviewers_internal_api.yml2
-rw-r--r--config/initializers/1_settings.rb10
-rw-r--r--config/initializers/7_redis.rb4
-rw-r--r--config/initializers/action_cable.rb13
-rw-r--r--config/initializers/active_record_renamed_table.rb6
-rw-r--r--config/initializers/database_query_analyzers.rb5
-rw-r--r--config/initializers/elastic_client_setup.rb3
-rw-r--r--config/initializers/peek.rb1
-rw-r--r--config/initializers/postgresql_cte.rb18
-rw-r--r--config/initializers/sidekiq.rb4
-rw-r--r--config/initializers/sprockets_patch.rb63
-rw-r--r--config/initializers/wikicloth_redos_patch.rb2
-rw-r--r--config/mail_room.yml1
-rw-r--r--config/metrics/counts_28d/20231102160653_i_quickactions_request_changes_monthly.yml23
-rw-r--r--config/metrics/counts_7d/20231102160653_i_quickactions_request_changes_weekly.yml23
-rw-r--r--config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml4
-rw-r--r--config/metrics/schema/base.json (renamed from config/metrics/schema.json)69
-rw-r--r--config/metrics/schema/internal_events.json106
-rw-r--r--config/metrics/schema/redis.json95
-rw-r--r--config/metrics/schema/redis_hll.json103
-rw-r--r--config/metrics/schema/status.json33
-rw-r--r--config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml4
-rw-r--r--config/redis.yml.example12
-rw-r--r--config/routes.rb13
-rw-r--r--config/routes/admin.rb3
-rw-r--r--config/routes/explore.rb1
-rw-r--r--config/routes/import.rb1
-rw-r--r--config/routes/organizations.rb1
-rw-r--r--config/routes/project.rb5
-rw-r--r--config/settings.rb3
-rw-r--r--config/sidekiq_queues.yml20
-rw-r--r--config/webpack.config.js14
143 files changed, 856 insertions, 442 deletions
diff --git a/config/application.rb b/config/application.rb
index 4ee2866dad2..847577f68cb 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -270,8 +270,6 @@ module Gitlab
config.assets.precompile << "application_utilities_dark.css"
config.assets.precompile << "application_dark.css"
- config.assets.precompile << "startup/*.css"
-
config.assets.precompile << "print.css"
config.assets.precompile << "mailer.css"
config.assets.precompile << "mailer_client_specific.css"
diff --git a/config/feature_categories.yml b/config/feature_categories.yml
index 5ac22ca085e..3eaf8b2b34d 100644
--- a/config/feature_categories.yml
+++ b/config/feature_categories.yml
@@ -16,17 +16,16 @@
- api
- api_security
- application_instrumentation
-- application_performance
- attack_emulation
- audit_events
- auto_devops
- backup_restore
-- billing_and_payments
- build
- build_artifacts
- capacity_planning
- cell
- ci-cd_visibility
+- cloud_connector
- cloud_native_installation
- code_quality
- code_review_workflow
@@ -94,6 +93,7 @@
- organization
- package_registry
- pages
+- permissions
- pipeline_composition
- portfolio_management
- product_analytics_data_management
diff --git a/config/feature_flags/development/ai_assist_api.yml b/config/feature_flags/development/abuse_report_notes.yml
index 9b7da480f62..9378b1a1d89 100644
--- a/config/feature_flags/development/ai_assist_api.yml
+++ b/config/feature_flags/development/abuse_report_notes.yml
@@ -1,8 +1,8 @@
---
-name: ai_assist_api
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/100500
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/378470
-milestone: '15.6'
+name: abuse_report_notes
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/134730
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/429027
+milestone: '16.6'
type: development
-group: group::incubation
+group: group::anti-abuse
default_enabled: false
diff --git a/config/feature_flags/development/access_token_pagination.yml b/config/feature_flags/development/access_token_pagination.yml
index df003ed8891..9cc8cf68e08 100644
--- a/config/feature_flags/development/access_token_pagination.yml
+++ b/config/feature_flags/development/access_token_pagination.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91372
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366534
milestone: '15.2'
type: development
-group: group::authentication and authorization
+group: group::authentication
default_enabled: false
diff --git a/config/feature_flags/development/activity_filter_has_mr.yml b/config/feature_flags/development/activity_filter_has_mr.yml
index 235e8b559b5..b276f6b9b49 100644
--- a/config/feature_flags/development/activity_filter_has_mr.yml
+++ b/config/feature_flags/development/activity_filter_has_mr.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/426104
milestone: '16.5'
type: development
group: group::threat insights
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/activity_filter_has_remediations.yml b/config/feature_flags/development/activity_filter_has_remediations.yml
new file mode 100644
index 00000000000..7a0b5f958f3
--- /dev/null
+++ b/config/feature_flags/development/activity_filter_has_remediations.yml
@@ -0,0 +1,8 @@
+---
+name: activity_filter_has_remediations
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135009
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/429262
+milestone: '16.6'
+type: development
+group: group::threat insights
+default_enabled: false
diff --git a/config/feature_flags/development/explain_code_vertex_ai.yml b/config/feature_flags/development/ambiguous_ref_modal.yml
index 4eb4d64ed30..c1cc52682e2 100644
--- a/config/feature_flags/development/explain_code_vertex_ai.yml
+++ b/config/feature_flags/development/ambiguous_ref_modal.yml
@@ -1,8 +1,8 @@
---
-name: explain_code_vertex_ai
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/125292
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/416907
-milestone: '16.2'
+name: ambiguous_ref_modal
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/133093
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/429523
+milestone: '16.6'
type: development
group: group::source code
default_enabled: false
diff --git a/config/feature_flags/development/auto_devops_banner_disabled.yml b/config/feature_flags/development/auto_devops_banner_disabled.yml
index 5e0c037bf23..e2087ad574c 100644
--- a/config/feature_flags/development/auto_devops_banner_disabled.yml
+++ b/config/feature_flags/development/auto_devops_banner_disabled.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350882
milestone: '10.0'
type: development
-group: group::pipeline execution
+group: group::environments
default_enabled: false
diff --git a/config/feature_flags/development/data_transfer_monitoring_mock_data.yml b/config/feature_flags/development/blob_blame_info.yml
index 77a43426e74..106ceb60cfe 100644
--- a/config/feature_flags/development/data_transfer_monitoring_mock_data.yml
+++ b/config/feature_flags/development/blob_blame_info.yml
@@ -1,8 +1,8 @@
---
-name: data_transfer_monitoring_mock_data
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113392
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/397693
-milestone: '15.11'
+name: blob_blame_info
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/133798
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/425272
+milestone: '16.5'
type: development
group: group::source code
default_enabled: false
diff --git a/config/feature_flags/development/build_service_proxy.yml b/config/feature_flags/development/build_service_proxy.yml
index 8032a39e959..cefb88b7b24 100644
--- a/config/feature_flags/development/build_service_proxy.yml
+++ b/config/feature_flags/development/build_service_proxy.yml
@@ -1,8 +1,8 @@
---
name: build_service_proxy
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/9723
-rollout_issue_url:
+rollout_issue_url:
milestone: '11.11'
type: development
-group: group::editor
+group: group::ide
default_enabled: false
diff --git a/config/feature_flags/development/jira_dvcs_end_of_life_amnesty.yml b/config/feature_flags/development/bulk_import_deferred_workers.yml
index dd72f9e13dd..1b6a022099c 100644
--- a/config/feature_flags/development/jira_dvcs_end_of_life_amnesty.yml
+++ b/config/feature_flags/development/bulk_import_deferred_workers.yml
@@ -1,8 +1,8 @@
---
-name: jira_dvcs_end_of_life_amnesty
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118126
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/408148
-milestone: '16.0'
+name: bulk_import_deferred_workers
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136137
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/431032
+milestone: '16.6'
type: development
group: group::import and integrate
default_enabled: false
diff --git a/config/feature_flags/development/composer_use_ssh_source_urls.yml b/config/feature_flags/development/bulk_import_details_page.yml
index d74dcdf9806..c8265161233 100644
--- a/config/feature_flags/development/composer_use_ssh_source_urls.yml
+++ b/config/feature_flags/development/bulk_import_details_page.yml
@@ -1,8 +1,8 @@
---
-name: composer_use_ssh_source_urls
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119739
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/422171
-milestone: '16.4'
+name: bulk_import_details_page
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135004
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/429109
+milestone: '16.6'
type: development
-group: group::package registry
+group: group::import and integrate
default_enabled: true
diff --git a/config/feature_flags/development/by_pass_two_factor_for_current_session.yml b/config/feature_flags/development/by_pass_two_factor_for_current_session.yml
index d60b5bdc234..5842c1ccc61 100644
--- a/config/feature_flags/development/by_pass_two_factor_for_current_session.yml
+++ b/config/feature_flags/development/by_pass_two_factor_for_current_session.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/122109
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/416535
milestone: '16.3'
type: development
-group: group::authentication and authorization
+group: group::authentication
default_enabled: false
diff --git a/config/feature_flags/development/ci_fix_performance_pipelines_json_endpoint.yml b/config/feature_flags/development/ci_catalog_create_metadata.yml
index 069d0349181..a73f499554d 100644
--- a/config/feature_flags/development/ci_fix_performance_pipelines_json_endpoint.yml
+++ b/config/feature_flags/development/ci_catalog_create_metadata.yml
@@ -1,8 +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'
+name: ci_catalog_create_metadata
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/134148
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/430120
+milestone: '16.6'
type: development
group: group::pipeline authoring
default_enabled: false
diff --git a/config/feature_flags/development/ci_job_artifacts_backlog_large_loop_limit.yml b/config/feature_flags/development/ci_job_artifacts_backlog_large_loop_limit.yml
index 1415d9e0db7..395580a4d80 100644
--- a/config/feature_flags/development/ci_job_artifacts_backlog_large_loop_limit.yml
+++ b/config/feature_flags/development/ci_job_artifacts_backlog_large_loop_limit.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76509
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/347151
milestone: '14.10'
type: development
-group: group::pipeline execution
+group: group::pipeline security
default_enabled: false
diff --git a/config/feature_flags/development/ci_require_credit_card_on_free_plan.yml b/config/feature_flags/development/ci_require_credit_card_on_free_plan.yml
index 7e5795de6a0..8816e0ebec4 100644
--- a/config/feature_flags/development/ci_require_credit_card_on_free_plan.yml
+++ b/config/feature_flags/development/ci_require_credit_card_on_free_plan.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61152
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330104
milestone: '13.12'
type: development
-group: group::fulfillment
+group: group::anti-abuse
default_enabled: false
diff --git a/config/feature_flags/development/ci_require_credit_card_on_trial_plan.yml b/config/feature_flags/development/ci_require_credit_card_on_trial_plan.yml
index 578101a1ba4..402a2b42310 100644
--- a/config/feature_flags/development/ci_require_credit_card_on_trial_plan.yml
+++ b/config/feature_flags/development/ci_require_credit_card_on_trial_plan.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61152
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330105
milestone: '13.12'
type: development
-group: group::fulfillment
+group: group::anti-abuse
default_enabled: false
diff --git a/config/feature_flags/development/ci_stop_unlock_pipelines.yml b/config/feature_flags/development/ci_stop_unlock_pipelines.yml
new file mode 100644
index 00000000000..a7ca6b73b4e
--- /dev/null
+++ b/config/feature_flags/development/ci_stop_unlock_pipelines.yml
@@ -0,0 +1,8 @@
+---
+name: ci_stop_unlock_pipelines
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/134967
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/428408
+milestone: '16.6'
+type: development
+group: group::pipeline security
+default_enabled: false
diff --git a/config/feature_flags/development/admin_group_member.yml b/config/feature_flags/development/ci_unlock_non_successful_pipelines.yml
index c6267dd3fe3..4cba44f5de4 100644
--- a/config/feature_flags/development/admin_group_member.yml
+++ b/config/feature_flags/development/ci_unlock_non_successful_pipelines.yml
@@ -1,8 +1,8 @@
---
-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
+name: ci_unlock_non_successful_pipelines
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/134967
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/428408
milestone: '16.5'
type: development
-group: group::authentication and authorization
+group: group::pipeline security
default_enabled: false
diff --git a/config/feature_flags/development/code_suggestions_for_instance_admin_enabled.yml b/config/feature_flags/development/code_suggestions_for_instance_admin_enabled.yml
index 1a7b2356f55..5df6440bd5b 100644
--- a/config/feature_flags/development/code_suggestions_for_instance_admin_enabled.yml
+++ b/config/feature_flags/development/code_suggestions_for_instance_admin_enabled.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/122645
rollout_issue_url:
milestone: '16.1'
type: development
-group: group::application performance
+group: group::cloud connector
default_enabled: false
diff --git a/config/feature_flags/development/runners_dashboard.yml b/config/feature_flags/development/code_tasks.yml
index dd773c5e337..fec0e8326f3 100644
--- a/config/feature_flags/development/runners_dashboard.yml
+++ b/config/feature_flags/development/code_tasks.yml
@@ -1,8 +1,8 @@
---
-name: runners_dashboard
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/125301
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/417002
-milestone: '16.2'
+name: code_tasks
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135717
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/430962
+milestone: '16.6'
type: development
-group: group::runner
+group: group::code creation
default_enabled: false
diff --git a/config/feature_flags/development/compare_project_authorization_linear_cte.yml b/config/feature_flags/development/compare_project_authorization_linear_cte.yml
index 7032e6f64f4..b992cd3897a 100644
--- a/config/feature_flags/development/compare_project_authorization_linear_cte.yml
+++ b/config/feature_flags/development/compare_project_authorization_linear_cte.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/122886
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/414310
milestone: '16.1'
type: development
-group: group::authentication and authorization
+group: group::authentication
default_enabled: false
diff --git a/config/feature_flags/development/container_registry_protected_containers.yml b/config/feature_flags/development/container_registry_protected_containers.yml
new file mode 100644
index 00000000000..94305b7251b
--- /dev/null
+++ b/config/feature_flags/development/container_registry_protected_containers.yml
@@ -0,0 +1,8 @@
+---
+name: container_registry_protected_containers
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/133527
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/429074
+milestone: '16.6'
+type: development
+group: group::container registry
+default_enabled: false \ No newline at end of file
diff --git a/config/feature_flags/development/create_embeddings_with_vertex_ai.yml b/config/feature_flags/development/create_embeddings_with_vertex_ai.yml
deleted file mode 100644
index 327961d971e..00000000000
--- a/config/feature_flags/development/create_embeddings_with_vertex_ai.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: create_embeddings_with_vertex_ai
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/129930
-rollout_issue_url:
-milestone: '16.4'
-type: development
-group: group::duo chat
-default_enabled: false
diff --git a/config/feature_flags/development/create_project_subscription_graphql_endpoint.yml b/config/feature_flags/development/create_project_subscription_graphql_endpoint.yml
new file mode 100644
index 00000000000..a39664a875d
--- /dev/null
+++ b/config/feature_flags/development/create_project_subscription_graphql_endpoint.yml
@@ -0,0 +1,8 @@
+---
+name: create_project_subscription_graphql_endpoint
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/133308
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/429339
+milestone: '16.6'
+type: development
+group: group::pipeline execution
+default_enabled: false
diff --git a/config/feature_flags/development/custom_roles_in_members_page.yml b/config/feature_flags/development/custom_roles_in_members_page.yml
index cb6bea5ca42..b7b7b2f6093 100644
--- a/config/feature_flags/development/custom_roles_in_members_page.yml
+++ b/config/feature_flags/development/custom_roles_in_members_page.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128491
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/422897
milestone: '16.3'
type: development
-group: group::authentication and authorization
+group: group::authorization
default_enabled: false
diff --git a/config/feature_flags/development/custom_roles_ui_saas.yml b/config/feature_flags/development/custom_roles_ui_saas.yml
index ea4925eb322..6ad2150f597 100644
--- a/config/feature_flags/development/custom_roles_ui_saas.yml
+++ b/config/feature_flags/development/custom_roles_ui_saas.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/130089
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/423077
milestone: '16.4'
type: development
-group: group::authentication and authorization
+group: group::authorization
default_enabled: true
diff --git a/config/feature_flags/development/disable_unsafe_regexp.yml b/config/feature_flags/development/disable_unsafe_regexp.yml
index 196b647082e..cb00645444f 100644
--- a/config/feature_flags/development/disable_unsafe_regexp.yml
+++ b/config/feature_flags/development/disable_unsafe_regexp.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79611
rollout_issue_url:
milestone: '14.9'
type: development
-group: group::pipeline execution
+group: group::pipeline authoring
default_enabled: false
diff --git a/config/feature_flags/development/display_cost_factored_storage_size_on_project_pages.yml b/config/feature_flags/development/display_cost_factored_storage_size_on_project_pages.yml
new file mode 100644
index 00000000000..9f47e4bf157
--- /dev/null
+++ b/config/feature_flags/development/display_cost_factored_storage_size_on_project_pages.yml
@@ -0,0 +1,8 @@
+---
+name: display_cost_factored_storage_size_on_project_pages
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/130862
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/428743
+milestone: '16.6'
+type: development
+group: group::utilization
+default_enabled: false
diff --git a/config/feature_flags/development/do_not_run_safety_net_auth_refresh_jobs.yml b/config/feature_flags/development/do_not_run_safety_net_auth_refresh_jobs.yml
index 94784f3facb..89035f5f32b 100644
--- a/config/feature_flags/development/do_not_run_safety_net_auth_refresh_jobs.yml
+++ b/config/feature_flags/development/do_not_run_safety_net_auth_refresh_jobs.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110986
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/390336
milestone: '15.9'
type: development
-group: group::authentication and authorization
+group: group::authentication
default_enabled: false
diff --git a/config/feature_flags/development/forti_authenticator.yml b/config/feature_flags/development/forti_authenticator.yml
index 63e780ccc64..fef86fa8bc0 100644
--- a/config/feature_flags/development/forti_authenticator.yml
+++ b/config/feature_flags/development/forti_authenticator.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45055
rollout_issue_url:
milestone: '13.5'
type: development
-group: group::authentication and authorization
+group: group::authentication
default_enabled: false
diff --git a/config/feature_flags/development/forti_token_cloud.yml b/config/feature_flags/development/forti_token_cloud.yml
index 5bf350c9b33..e3f9941e92f 100644
--- a/config/feature_flags/development/forti_token_cloud.yml
+++ b/config/feature_flags/development/forti_token_cloud.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49089
rollout_issue_url:
milestone: '13.7'
type: development
-group: group::authentication and authorization
+group: group::authentication
default_enabled: false
diff --git a/config/feature_flags/development/super_sidebar_logged_out.yml b/config/feature_flags/development/frecent_namespaces_suggestions.yml
index 8deeb63b537..1fe0f0694e8 100644
--- a/config/feature_flags/development/super_sidebar_logged_out.yml
+++ b/config/feature_flags/development/frecent_namespaces_suggestions.yml
@@ -1,8 +1,8 @@
---
-name: super_sidebar_logged_out
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127756
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/419936
-milestone: '16.3'
+name: frecent_namespaces_suggestions
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132128
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/428362
+milestone: '16.6'
type: development
group: group::foundations
default_enabled: false
diff --git a/config/feature_flags/development/github_importer_raise_max_interruptions.yml b/config/feature_flags/development/github_importer_raise_max_interruptions.yml
new file mode 100644
index 00000000000..3cbcc10865f
--- /dev/null
+++ b/config/feature_flags/development/github_importer_raise_max_interruptions.yml
@@ -0,0 +1,8 @@
+---
+name: github_importer_raise_max_interruptions
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/134949
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/429306
+milestone: '16.6'
+type: development
+group: group::import and integrate
+default_enabled: false
diff --git a/config/feature_flags/development/global_ci_catalog.yml b/config/feature_flags/development/global_ci_catalog.yml
new file mode 100644
index 00000000000..cf61406112b
--- /dev/null
+++ b/config/feature_flags/development/global_ci_catalog.yml
@@ -0,0 +1,8 @@
+---
+name: global_ci_catalog
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/133885
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/427940
+milestone: '16.6'
+type: development
+group: group::pipeline authoring
+default_enabled: false
diff --git a/config/feature_flags/development/global_dependency_scanning_on_advisory_ingestion.yml b/config/feature_flags/development/global_dependency_scanning_on_advisory_ingestion.yml
new file mode 100644
index 00000000000..ca33869fd2a
--- /dev/null
+++ b/config/feature_flags/development/global_dependency_scanning_on_advisory_ingestion.yml
@@ -0,0 +1,8 @@
+---
+name: global_dependency_scanning_on_advisory_ingestion
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135581
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/427424
+milestone: '16.6'
+type: development
+group: group::composition analysis
+default_enabled: false
diff --git a/config/feature_flags/development/issue_assignees_widget.yml b/config/feature_flags/development/group_multi_select_tokens.yml
index 5163a345a3b..485a665d1eb 100644
--- a/config/feature_flags/development/issue_assignees_widget.yml
+++ b/config/feature_flags/development/group_multi_select_tokens.yml
@@ -1,8 +1,8 @@
---
-name: issue_assignees_widget
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59620/
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/328185
-milestone: '13.11'
+name: group_multi_select_tokens
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/133725
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/428741
+milestone: '16.6'
type: development
group: group::project management
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/bulk_import_idempotent_workers.yml b/config/feature_flags/development/import_fallback_to_db_empty_cache.yml
index 83d5b7f65c7..d97adc841fc 100644
--- a/config/feature_flags/development/bulk_import_idempotent_workers.yml
+++ b/config/feature_flags/development/import_fallback_to_db_empty_cache.yml
@@ -1,8 +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'
+name: import_fallback_to_db_empty_cache
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/133914
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/428700
+milestone: '16.6'
type: development
group: group::import and integrate
default_enabled: false
diff --git a/config/feature_flags/development/saved_replies.yml b/config/feature_flags/development/increase_jira_import_issues_timeout.yml
index 0c973292ba0..709522b098b 100644
--- a/config/feature_flags/development/saved_replies.yml
+++ b/config/feature_flags/development/increase_jira_import_issues_timeout.yml
@@ -1,8 +1,8 @@
---
-name: saved_replies
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80811
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/352956
-milestone: '14.9'
+name: increase_jira_import_issues_timeout
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135050
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/429293
+milestone: '16.6'
type: development
group: group::project management
default_enabled: true
diff --git a/config/feature_flags/development/inherit_higher_access_levels_no_cross_join.yml b/config/feature_flags/development/inherit_higher_access_levels_no_cross_join.yml
index b4cef5219ba..299a43ccb9e 100644
--- a/config/feature_flags/development/inherit_higher_access_levels_no_cross_join.yml
+++ b/config/feature_flags/development/inherit_higher_access_levels_no_cross_join.yml
@@ -4,5 +4,5 @@ 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
+group: group::authentication
default_enabled: true
diff --git a/config/feature_flags/development/invert_omniauth_args_merging.yml b/config/feature_flags/development/invert_omniauth_args_merging.yml
new file mode 100644
index 00000000000..1a5d0a08541
--- /dev/null
+++ b/config/feature_flags/development/invert_omniauth_args_merging.yml
@@ -0,0 +1,8 @@
+---
+name: invert_omniauth_args_merging
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135770
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/430348
+milestone: '16.6'
+type: development
+group: group::authentication
+default_enabled: false
diff --git a/config/feature_flags/development/create_deployment_only_for_processable_jobs.yml b/config/feature_flags/development/k8s_watch_api.yml
index f721dd8265c..c8aa176538e 100644
--- a/config/feature_flags/development/create_deployment_only_for_processable_jobs.yml
+++ b/config/feature_flags/development/k8s_watch_api.yml
@@ -1,7 +1,7 @@
---
-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
+name: k8s_watch_api
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/133734
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/427762
milestone: '16.5'
type: development
group: group::environments
diff --git a/config/feature_flags/development/linear_project_authorization.yml b/config/feature_flags/development/linear_project_authorization.yml
index f3fcb968b8e..e1f639a4a16 100644
--- a/config/feature_flags/development/linear_project_authorization.yml
+++ b/config/feature_flags/development/linear_project_authorization.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117988
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/410459
milestone: '16.0'
type: development
-group: group::authentication and authorization
+group: group::authentication
default_enabled: false
diff --git a/config/feature_flags/development/verify_push_rules_for_first_commit.yml b/config/feature_flags/development/log_git_streaming_audit_events.yml
index f18f9eecfdb..1c3cace7aa5 100644
--- a/config/feature_flags/development/verify_push_rules_for_first_commit.yml
+++ b/config/feature_flags/development/log_git_streaming_audit_events.yml
@@ -1,8 +1,8 @@
---
-name: verify_push_rules_for_first_commit
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/123950
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/419128
-milestone: '16.3'
+name: log_git_streaming_audit_events
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/123486
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/415138
+milestone: "16.5"
type: development
group: group::source code
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/manage_project_access_tokens.yml b/config/feature_flags/development/manage_project_access_tokens.yml
index 6a91e1fc140..a6cf2cf4f9f 100644
--- a/config/feature_flags/development/manage_project_access_tokens.yml
+++ b/config/feature_flags/development/manage_project_access_tokens.yml
@@ -1,8 +1,8 @@
---
name: manage_project_access_tokens
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132342
-rollout_issue_url:
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/430353
milestone: '16.5'
type: development
-group: group::authentication and authorization
+group: group::authorization
default_enabled: false
diff --git a/config/feature_flags/development/user_profile_overflow_menu_vue.yml b/config/feature_flags/development/mastodon_social_ui.yml
index 42a792414cf..5e04d8176e4 100644
--- a/config/feature_flags/development/user_profile_overflow_menu_vue.yml
+++ b/config/feature_flags/development/mastodon_social_ui.yml
@@ -1,8 +1,8 @@
---
-name: user_profile_overflow_menu_vue
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/122971
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/414773
-milestone: '16.1'
+name: mastodon_social_ui
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132892
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/428163
+milestone: '16.5'
type: development
group: group::tenant scale
default_enabled: false
diff --git a/config/feature_flags/development/member_expiring_email_notification.yml b/config/feature_flags/development/member_expiring_email_notification.yml
index 36a15c27daf..c37f9667b58 100644
--- a/config/feature_flags/development/member_expiring_email_notification.yml
+++ b/config/feature_flags/development/member_expiring_email_notification.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124577
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/416581
milestone: '16.3'
type: development
-group: group::authentication and authorization
+group: group::authentication
default_enabled: true
diff --git a/config/feature_flags/development/ai_self_discover.yml b/config/feature_flags/development/mr_request_changes.yml
index ef5e2bc8926..f55e410190a 100644
--- a/config/feature_flags/development/ai_self_discover.yml
+++ b/config/feature_flags/development/mr_request_changes.yml
@@ -1,8 +1,8 @@
---
-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'
+name: mr_request_changes
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/134766
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/429557
+milestone: '16.6'
type: development
-group: group::ai framework
+group: group::code review
default_enabled: false
diff --git a/config/feature_flags/development/coop_header.yml b/config/feature_flags/development/new_pipeline_graph.yml
index 9166f4c6819..d3570980f63 100644
--- a/config/feature_flags/development/coop_header.yml
+++ b/config/feature_flags/development/new_pipeline_graph.yml
@@ -1,8 +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
+name: new_pipeline_graph
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132462
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/426902
milestone: '16.5'
type: development
-group: group::authentication and authorization
+group: group::ux paper cuts
default_enabled: false
diff --git a/config/feature_flags/development/nuget_duplicates_option.yml b/config/feature_flags/development/nuget_duplicates_option.yml
deleted file mode 100644
index 5b386063f26..00000000000
--- a/config/feature_flags/development/nuget_duplicates_option.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: nuget_duplicates_option
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/123783
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/419078
-milestone: '16.3'
-type: development
-group: group::package registry
-default_enabled: false
diff --git a/config/feature_flags/development/observability_metrics.yml b/config/feature_flags/development/observability_metrics.yml
new file mode 100644
index 00000000000..c8bb1d3c2e2
--- /dev/null
+++ b/config/feature_flags/development/observability_metrics.yml
@@ -0,0 +1,8 @@
+---
+name: observability_metrics
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/134393
+rollout_issue_url: https://gitlab.com/gitlab-org/opstrace/opstrace/-/issues/2444
+milestone: '16.6'
+type: development
+group: group::observability
+default_enabled: false
diff --git a/config/feature_flags/development/ci_variable_drawer.yml b/config/feature_flags/development/oidc_issuer_url.yml
index ad451ab6414..e919d1095d1 100644
--- a/config/feature_flags/development/ci_variable_drawer.yml
+++ b/config/feature_flags/development/oidc_issuer_url.yml
@@ -1,8 +1,8 @@
---
-name: ci_variable_drawer
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/126197
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/418005
-milestone: '16.3'
+name: oidc_issuer_url
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135049
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/429855
+milestone: '16.6'
type: development
group: group::pipeline security
default_enabled: false
diff --git a/config/feature_flags/development/only_highlight_discussions_requested.yml b/config/feature_flags/development/only_highlight_discussions_requested.yml
new file mode 100644
index 00000000000..8dfb93c33e0
--- /dev/null
+++ b/config/feature_flags/development/only_highlight_discussions_requested.yml
@@ -0,0 +1,8 @@
+---
+name: only_highlight_discussions_requested
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135096
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/429489
+milestone: '16.6'
+type: development
+group: group::code review
+default_enabled: false
diff --git a/config/feature_flags/development/openai_experimentation.yml b/config/feature_flags/development/openai_experimentation.yml
deleted file mode 100644
index 054e6442445..00000000000
--- a/config/feature_flags/development/openai_experimentation.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: openai_experimentation
-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 framework
-default_enabled: false
diff --git a/config/feature_flags/development/order_builds_for_group_runner.yml b/config/feature_flags/development/order_builds_for_group_runner.yml
index 50f9a301ad6..3ca461e8033 100644
--- a/config/feature_flags/development/order_builds_for_group_runner.yml
+++ b/config/feature_flags/development/order_builds_for_group_runner.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/94815
rollout_issue_url:
milestone: '15.4'
type: development
-group: group::pipeline execution
+group: group::runner
default_enabled: true
diff --git a/config/feature_flags/development/personal_snippet_reference_filters.yml b/config/feature_flags/development/personal_snippet_reference_filters.yml
index eb97a2caf0d..099378f7da0 100644
--- a/config/feature_flags/development/personal_snippet_reference_filters.yml
+++ b/config/feature_flags/development/personal_snippet_reference_filters.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38571
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/235155
milestone: '13.3'
type: development
-group: group::editor
+group: group::source code
default_enabled: false
diff --git a/config/feature_flags/development/preserve_unchanged_markdown.yml b/config/feature_flags/development/preserve_unchanged_markdown.yml
index 55e5d913389..8d0dc879bdb 100644
--- a/config/feature_flags/development/preserve_unchanged_markdown.yml
+++ b/config/feature_flags/development/preserve_unchanged_markdown.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86060
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/360713
milestone: '15.0'
type: development
-group: group::editor
+group: group::knowledge
default_enabled: false
diff --git a/config/feature_flags/development/product_analytics_usage_quota.yml b/config/feature_flags/development/product_analytics_usage_quota.yml
new file mode 100644
index 00000000000..d5807c5b507
--- /dev/null
+++ b/config/feature_flags/development/product_analytics_usage_quota.yml
@@ -0,0 +1,8 @@
+---
+name: product_analytics_usage_quota
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/133781
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/427838
+milestone: '16.6'
+type: development
+group: group::product analytics
+default_enabled: false
diff --git a/config/feature_flags/development/project_overwrite_service_tracking.yml b/config/feature_flags/development/project_overwrite_service_tracking.yml
index 1a0c4fed4cd..c2e2349e066 100644
--- a/config/feature_flags/development/project_overwrite_service_tracking.yml
+++ b/config/feature_flags/development/project_overwrite_service_tracking.yml
@@ -4,5 +4,5 @@ introduced_by_url:
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350889
milestone: '14.1'
type: development
-group: group::pipeline execution
+group: group::import and integrate
default_enabled: false
diff --git a/config/feature_flags/development/vulnerability_report_grouping.yml b/config/feature_flags/development/project_tool_filter_with_scanner_name.yml
index fc7312cc147..c778edeba52 100644
--- a/config/feature_flags/development/vulnerability_report_grouping.yml
+++ b/config/feature_flags/development/project_tool_filter_with_scanner_name.yml
@@ -1,8 +1,8 @@
---
-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
+name: project_tool_filter_with_scanner_name
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/131310
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/424509
milestone: '16.5'
type: development
group: group::threat insights
-default_enabled: true
+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
index 67b333420a7..9c5a44fa6c4 100644
--- a/config/feature_flags/development/rate_limit_oauth_api.yml
+++ b/config/feature_flags/development/rate_limit_oauth_api.yml
@@ -4,5 +4,5 @@ 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
+group: group::authentication
default_enabled: false
diff --git a/config/feature_flags/development/use_primary_store_as_default_for_action_cable.yml b/config/feature_flags/development/reduce_duplicate_job_key_ttl.yml
index d5606516820..a338bc93753 100644
--- a/config/feature_flags/development/use_primary_store_as_default_for_action_cable.yml
+++ b/config/feature_flags/development/reduce_duplicate_job_key_ttl.yml
@@ -1,8 +1,8 @@
---
-name: use_primary_store_as_default_for_action_cable
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/126451
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/423216
-milestone: '16.4'
+name: reduce_duplicate_job_key_ttl
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135910
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/430345
+milestone: '16.6'
type: development
group: group::scalability
default_enabled: false
diff --git a/config/feature_flags/development/reject_unsigned_commits_by_gitlab.yml b/config/feature_flags/development/reject_unsigned_commits_by_gitlab.yml
index 93c0026d59d..d44e1e22902 100644
--- a/config/feature_flags/development/reject_unsigned_commits_by_gitlab.yml
+++ b/config/feature_flags/development/reject_unsigned_commits_by_gitlab.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58453
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326775
milestone: '13.11'
type: development
-group: group::editor
+group: group::ide
default_enabled: true
diff --git a/config/feature_flags/development/merge_request_refs_cleanup.yml b/config/feature_flags/development/remove_mr_blocking_constraints.yml
index e306dd89c93..df4631c711d 100644
--- a/config/feature_flags/development/merge_request_refs_cleanup.yml
+++ b/config/feature_flags/development/remove_mr_blocking_constraints.yml
@@ -1,8 +1,8 @@
---
-name: merge_request_refs_cleanup
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51558
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/336070
-milestone: '13.8'
+name: remove_mr_blocking_constraints
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/133897
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/429428
+milestone: '16.6'
type: development
group: group::code review
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/replicate_object_pool_on_move.yml b/config/feature_flags/development/replicate_object_pool_on_move.yml
index 8f34969a02d..e413c8ee56c 100644
--- a/config/feature_flags/development/replicate_object_pool_on_move.yml
+++ b/config/feature_flags/development/replicate_object_pool_on_move.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/420720
milestone: '16.3'
type: development
group: group::source code
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/restrict_ci_job_token_for_public_and_internal_projects.yml b/config/feature_flags/development/restrict_ci_job_token_for_public_and_internal_projects.yml
new file mode 100644
index 00000000000..31216be0a5c
--- /dev/null
+++ b/config/feature_flags/development/restrict_ci_job_token_for_public_and_internal_projects.yml
@@ -0,0 +1,8 @@
+---
+name: restrict_ci_job_token_for_public_and_internal_projects
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135263
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/417172
+milestone: '16.6'
+type: development
+group: group::pipeline security
+default_enabled: true
diff --git a/config/feature_flags/development/reduced_build_attributes_list_for_rules.yml b/config/feature_flags/development/restrict_pipeline_cancellation_by_role.yml
index 85170fb02ba..0ef8a5d38db 100644
--- a/config/feature_flags/development/reduced_build_attributes_list_for_rules.yml
+++ b/config/feature_flags/development/restrict_pipeline_cancellation_by_role.yml
@@ -1,8 +1,8 @@
---
-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'
+name: restrict_pipeline_cancellation_by_role
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135047
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/429699
+milestone: '16.6'
type: development
group: group::pipeline execution
default_enabled: false
diff --git a/config/feature_flags/development/restyle_login_page.yml b/config/feature_flags/development/restyle_login_page.yml
index bfe99590e6e..90b56e64c48 100644
--- a/config/feature_flags/development/restyle_login_page.yml
+++ b/config/feature_flags/development/restyle_login_page.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91673
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/368387
milestone: '15.2'
type: development
-group: group::authentication and authorization
+group: group::authentication
default_enabled: true
diff --git a/config/feature_flags/development/rugged_commit_is_ancestor.yml b/config/feature_flags/development/rugged_commit_is_ancestor.yml
deleted file mode 100644
index 470b0b60bfe..00000000000
--- a/config/feature_flags/development/rugged_commit_is_ancestor.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: rugged_commit_is_ancestor
-introduced_by_url:
-rollout_issue_url:
-milestone:
-type: development
-group: group::gitaly
-default_enabled: false
diff --git a/config/feature_flags/development/rugged_commit_tree_entry.yml b/config/feature_flags/development/rugged_commit_tree_entry.yml
deleted file mode 100644
index c0ba656f7a6..00000000000
--- a/config/feature_flags/development/rugged_commit_tree_entry.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: rugged_commit_tree_entry
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/25896
-rollout_issue_url:
-milestone: '11.9'
-type: development
-group: group::gitaly
-default_enabled: false
diff --git a/config/feature_flags/development/rugged_find_commit.yml b/config/feature_flags/development/rugged_find_commit.yml
deleted file mode 100644
index e1f9de24abd..00000000000
--- a/config/feature_flags/development/rugged_find_commit.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: rugged_find_commit
-introduced_by_url:
-rollout_issue_url:
-milestone:
-type: development
-group: group::gitaly
-default_enabled: false
diff --git a/config/feature_flags/development/rugged_list_commits_by_oid.yml b/config/feature_flags/development/rugged_list_commits_by_oid.yml
deleted file mode 100644
index e41c717a5fe..00000000000
--- a/config/feature_flags/development/rugged_list_commits_by_oid.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: rugged_list_commits_by_oid
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/27441
-rollout_issue_url:
-milestone: '11.10'
-type: development
-group: group::gitaly
-default_enabled: false
diff --git a/config/feature_flags/development/rugged_tree_entries.yml b/config/feature_flags/development/rugged_tree_entries.yml
deleted file mode 100644
index b6ac660f291..00000000000
--- a/config/feature_flags/development/rugged_tree_entries.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: rugged_tree_entries
-introduced_by_url:
-rollout_issue_url:
-milestone:
-type: development
-group: group::gitaly
-default_enabled: false
diff --git a/config/feature_flags/development/rugged_tree_entry.yml b/config/feature_flags/development/rugged_tree_entry.yml
deleted file mode 100644
index 976cc4573f6..00000000000
--- a/config/feature_flags/development/rugged_tree_entry.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: rugged_tree_entry
-introduced_by_url:
-rollout_issue_url:
-milestone:
-type: development
-group: group::gitaly
-default_enabled: false
diff --git a/config/feature_flags/development/search_issues_hide_archived_projects.yml b/config/feature_flags/development/search_issues_hide_archived_projects.yml
deleted file mode 100644
index 68a6d058e81..00000000000
--- a/config/feature_flags/development/search_issues_hide_archived_projects.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: search_issues_hide_archived_projects
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124846
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/416483
-milestone: '16.2'
-type: development
-group: group::global search
-default_enabled: false
diff --git a/config/feature_flags/development/search_merge_requests_hide_archived_projects.yml b/config/feature_flags/development/search_merge_requests_hide_archived_projects.yml
deleted file mode 100644
index 565d32b7188..00000000000
--- a/config/feature_flags/development/search_merge_requests_hide_archived_projects.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: search_merge_requests_hide_archived_projects
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/126024
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/417595
-milestone: '16.3'
-type: development
-group: group::global search
-default_enabled: false
diff --git a/config/feature_flags/development/search_notes_hide_archived_projects.yml b/config/feature_flags/development/search_notes_hide_archived_projects.yml
deleted file mode 100644
index c0a922ea08b..00000000000
--- a/config/feature_flags/development/search_notes_hide_archived_projects.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: search_notes_hide_archived_projects
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127333
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/419534
-milestone: '16.3'
-type: development
-group: group::global search
-default_enabled: false
-
diff --git a/config/feature_flags/development/service_accounts_crud.yml b/config/feature_flags/development/service_accounts_crud.yml
index 48a9104398d..5c55a910b1a 100644
--- a/config/feature_flags/development/service_accounts_crud.yml
+++ b/config/feature_flags/development/service_accounts_crud.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113884
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/397730
milestone: '15.11'
type: development
-group: group::authentication and authorization
+group: group::authentication
default_enabled: false
diff --git a/config/feature_flags/development/service_desk_new_note_email_native_attachments.yml b/config/feature_flags/development/service_desk_new_note_email_native_attachments.yml
deleted file mode 100644
index 89f0804ad39..00000000000
--- a/config/feature_flags/development/service_desk_new_note_email_native_attachments.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: service_desk_new_note_email_native_attachments
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107887
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/386860
-milestone: '15.8'
-type: development
-group: group::respond
-default_enabled: true
diff --git a/config/feature_flags/development/set_feature_flag_service.yml b/config/feature_flags/development/set_feature_flag_service.yml
index f25076177d6..4b49af02dfd 100644
--- a/config/feature_flags/development/set_feature_flag_service.yml
+++ b/config/feature_flags/development/set_feature_flag_service.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/87028
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373176
milestone: '15.4'
type: development
-group: group::pipeline execution
+group: group::import and integrate
default_enabled: false
diff --git a/config/feature_flags/development/source_editor_toolbar.yml b/config/feature_flags/development/source_editor_toolbar.yml
index 6fe2dd2d306..6d8a749b945 100644
--- a/config/feature_flags/development/source_editor_toolbar.yml
+++ b/config/feature_flags/development/source_editor_toolbar.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82304
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/354748
milestone: '14.9'
type: development
-group: group::editor
+group: group::source code
default_enabled: false
diff --git a/config/feature_flags/development/sourcegraph.yml b/config/feature_flags/development/sourcegraph.yml
index f9aa76f6c7c..0b9e45ef4b4 100644
--- a/config/feature_flags/development/sourcegraph.yml
+++ b/config/feature_flags/development/sourcegraph.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/16556
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/292199
milestone: '12.5'
type: development
-group: group::editor
+group: group::source code
default_enabled: true
diff --git a/config/feature_flags/development/specialized_worker_for_group_lock_update_auth_recalculation.yml b/config/feature_flags/development/specialized_worker_for_group_lock_update_auth_recalculation.yml
index aa8e243e89e..0ddaed98be5 100644
--- a/config/feature_flags/development/specialized_worker_for_group_lock_update_auth_recalculation.yml
+++ b/config/feature_flags/development/specialized_worker_for_group_lock_update_auth_recalculation.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66525
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/336592
milestone: '14.2'
type: development
-group: group::authentication and authorization
+group: group::authentication
default_enabled: false
diff --git a/config/feature_flags/development/summarize_notes_with_anthropic.yml b/config/feature_flags/development/summarize_notes_with_anthropic.yml
new file mode 100644
index 00000000000..d9e91748d5a
--- /dev/null
+++ b/config/feature_flags/development/summarize_notes_with_anthropic.yml
@@ -0,0 +1,8 @@
+---
+name: summarize_notes_with_anthropic
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/134731
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/work_items/430196
+milestone: '16.6'
+type: development
+group: group::duo chat
+default_enabled: false
diff --git a/config/feature_flags/development/super_sidebar_nav_enrolled.yml b/config/feature_flags/development/super_sidebar_nav_enrolled.yml
deleted file mode 100644
index 14b2e9df39f..00000000000
--- a/config/feature_flags/development/super_sidebar_nav_enrolled.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: super_sidebar_nav_enrolled
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119506
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/410121
-milestone: '16.0'
-type: development
-group: group::foundations
-default_enabled: true
diff --git a/config/feature_flags/development/support_group_level_merge_checks_setting.yml b/config/feature_flags/development/support_group_level_merge_checks_setting.yml
index 282fa289c91..4537c5ff5b7 100644
--- a/config/feature_flags/development/support_group_level_merge_checks_setting.yml
+++ b/config/feature_flags/development/support_group_level_merge_checks_setting.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/377723
milestone: '15.8'
type: development
group: group::code review
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/two_factor_for_cli.yml b/config/feature_flags/development/two_factor_for_cli.yml
index 341f06d9ffa..0a2430146a6 100644
--- a/config/feature_flags/development/two_factor_for_cli.yml
+++ b/config/feature_flags/development/two_factor_for_cli.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39703
rollout_issue_url:
milestone: '13.5'
type: development
-group: group::authentication and authorization
+group: group::authentication
default_enabled: false
diff --git a/config/feature_flags/development/unbatch_graphql_queries.yml b/config/feature_flags/development/unbatch_graphql_queries.yml
deleted file mode 100644
index 8a78a46c109..00000000000
--- a/config/feature_flags/development/unbatch_graphql_queries.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: unbatch_graphql_queries
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117407
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/406765
-milestone: '16.0'
-type: development
-group: group::project management
-default_enabled: true
diff --git a/config/feature_flags/development/use_embeddings_with_vertex.yml b/config/feature_flags/development/use_embeddings_with_vertex.yml
deleted file mode 100644
index 1f37539b4ff..00000000000
--- a/config/feature_flags/development/use_embeddings_with_vertex.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: use_embeddings_with_vertex
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/130421
-rollout_issue_url:
-milestone: '16.5'
-type: development
-group: group::duo chat
-default_enabled: false
diff --git a/config/feature_flags/development/use_gitlab_http_v2.yml b/config/feature_flags/development/use_gitlab_http_v2.yml
index 92a3cdddbb9..8a840c48a4b 100644
--- a/config/feature_flags/development/use_gitlab_http_v2.yml
+++ b/config/feature_flags/development/use_gitlab_http_v2.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/426549
milestone: '16.5'
type: development
group: group::pipeline authoring
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/use_new_rule_finalize_approach.yml b/config/feature_flags/development/use_new_rule_finalize_approach.yml
new file mode 100644
index 00000000000..32de525624a
--- /dev/null
+++ b/config/feature_flags/development/use_new_rule_finalize_approach.yml
@@ -0,0 +1,8 @@
+---
+name: use_new_rule_finalize_approach
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/133633
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/427612
+milestone: '16.6'
+type: development
+group: group::code review
+default_enabled: false
diff --git a/config/feature_flags/development/use_pipeline_wizard_for_pages.yml b/config/feature_flags/development/use_pipeline_wizard_for_pages.yml
deleted file mode 100644
index 2de1b952f95..00000000000
--- a/config/feature_flags/development/use_pipeline_wizard_for_pages.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: use_pipeline_wizard_for_pages
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78276
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/349095
-milestone: '15.4'
-type: development
-group: group::incubation
-default_enabled: true
diff --git a/config/feature_flags/development/use_primary_and_secondary_stores_for_action_cable.yml b/config/feature_flags/development/use_primary_and_secondary_stores_for_shared_state.yml
index 50ffddd2c0c..3e22d84d192 100644
--- a/config/feature_flags/development/use_primary_and_secondary_stores_for_action_cable.yml
+++ b/config/feature_flags/development/use_primary_and_secondary_stores_for_shared_state.yml
@@ -1,8 +1,8 @@
---
-name: use_primary_and_secondary_stores_for_action_cable
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/126451
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/423216
-milestone: '16.4'
+name: use_primary_and_secondary_stores_for_shared_state
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/134483
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/429884
+milestone: '16.6'
type: development
group: group::scalability
default_enabled: false
diff --git a/config/feature_flags/development/use_primary_store_as_default_for_shared_state.yml b/config/feature_flags/development/use_primary_store_as_default_for_shared_state.yml
new file mode 100644
index 00000000000..4c309144342
--- /dev/null
+++ b/config/feature_flags/development/use_primary_store_as_default_for_shared_state.yml
@@ -0,0 +1,8 @@
+---
+name: use_primary_store_as_default_for_shared_state
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/134483
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/429884
+milestone: '16.6'
+type: development
+group: group::scalability
+default_enabled: false
diff --git a/config/feature_flags/development/jwt_auth_space_delimited_scopes.yml b/config/feature_flags/development/use_repository_list_tags_on_graphql.yml
index cddeb60c4ab..926d952e6f9 100644
--- a/config/feature_flags/development/jwt_auth_space_delimited_scopes.yml
+++ b/config/feature_flags/development/use_repository_list_tags_on_graphql.yml
@@ -1,7 +1,7 @@
---
-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
+name: use_repository_list_tags_on_graphql
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132716
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/426358
milestone: '16.5'
type: development
group: group::container registry
diff --git a/config/feature_flags/development/use_sql_functions_for_primary_key_lookups.yml b/config/feature_flags/development/use_sql_functions_for_primary_key_lookups.yml
new file mode 100644
index 00000000000..c8ee2894aef
--- /dev/null
+++ b/config/feature_flags/development/use_sql_functions_for_primary_key_lookups.yml
@@ -0,0 +1,8 @@
+---
+name: use_sql_functions_for_primary_key_lookups
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135196
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/429479
+milestone: '16.6'
+type: development
+group: group::optimize
+default_enabled: false
diff --git a/config/feature_flags/development/value_stream_dashboard_on_off_setting.yml b/config/feature_flags/development/value_stream_dashboard_on_off_setting.yml
deleted file mode 100644
index a6023199d05..00000000000
--- a/config/feature_flags/development/value_stream_dashboard_on_off_setting.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: value_stream_dashboard_on_off_setting
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/120610
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/411223
-milestone: '16.1'
-type: development
-group: group::optimize
-default_enabled: true
diff --git a/config/feature_flags/development/vscode_web_ide.yml b/config/feature_flags/development/vscode_web_ide.yml
index dc9d9d5f5f1..93f4141ed97 100644
--- a/config/feature_flags/development/vscode_web_ide.yml
+++ b/config/feature_flags/development/vscode_web_ide.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95169
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/371084
milestone: '15.4'
type: development
-group: group::editor
+group: group::ide
default_enabled: true
diff --git a/config/feature_flags/development/webauthn_without_totp.yml b/config/feature_flags/development/webauthn_without_totp.yml
index 3820c5edfb9..c4174e7f7c0 100644
--- a/config/feature_flags/development/webauthn_without_totp.yml
+++ b/config/feature_flags/development/webauthn_without_totp.yml
@@ -4,5 +4,5 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107438
rollout_issue_url: "https://gitlab.com/gitlab-org/gitlab/-/issues/386270"
milestone: '15.9'
type: development
-group: group::authentication and authorization
+group: group::authentication
default_enabled: false
diff --git a/config/feature_flags/development/widget_pipeline_pass_subscription_update.yml b/config/feature_flags/development/widget_pipeline_pass_subscription_update.yml
new file mode 100644
index 00000000000..764b0a59291
--- /dev/null
+++ b/config/feature_flags/development/widget_pipeline_pass_subscription_update.yml
@@ -0,0 +1,8 @@
+---
+name: widget_pipeline_pass_subscription_update
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132353
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/428633
+milestone: '16.6'
+type: development
+group: group::code review
+default_enabled: false
diff --git a/config/feature_flags/development/wiki_front_matter.yml b/config/feature_flags/development/wiki_front_matter.yml
index 39196440d17..6e4cf0db88b 100644
--- a/config/feature_flags/development/wiki_front_matter.yml
+++ b/config/feature_flags/development/wiki_front_matter.yml
@@ -1,8 +1,8 @@
---
name: wiki_front_matter
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27706
-rollout_issue_url:
+rollout_issue_url:
milestone: '12.10'
type: development
-group: group::editor
+group: group::knowledge
default_enabled: false
diff --git a/config/feature_flags/development/print_wiki.yml b/config/feature_flags/development/wiki_front_matter_title.yml
index 75305425deb..381bb2e1154 100644
--- a/config/feature_flags/development/print_wiki.yml
+++ b/config/feature_flags/development/wiki_front_matter_title.yml
@@ -1,8 +1,8 @@
---
-name: print_wiki
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/125260
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/414691
-milestone: '16.3'
+name: wiki_front_matter_title
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/133521
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/428259
+milestone: '16.6'
type: development
group: group::knowledge
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/experiment/disable_network_graph_notes_count.yml b/config/feature_flags/experiment/disable_network_graph_notes_count.yml
deleted file mode 100644
index fa4e5b4e104..00000000000
--- a/config/feature_flags/experiment/disable_network_graph_notes_count.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: disable_network_graph_notes_count
-introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103636"
-rollout_issue_url:
-milestone: '15.6'
-type: experiment
-group: group::source code
-default_enabled: false
diff --git a/config/feature_flags/experiment/ios_specific_templates.yml b/config/feature_flags/experiment/ios_specific_templates.yml
deleted file mode 100644
index 0af80e7a5bb..00000000000
--- a/config/feature_flags/experiment/ios_specific_templates.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ios_specific_templates
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84589
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356398
-milestone: "14.10"
-type: experiment
-group: group::activation
-default_enabled: false
diff --git a/config/feature_flags/ops/automatic_lock_writes_on_partition_tables.yml b/config/feature_flags/ops/automatic_lock_writes_on_partition_tables.yml
new file mode 100644
index 00000000000..dcaa0c9b4cb
--- /dev/null
+++ b/config/feature_flags/ops/automatic_lock_writes_on_partition_tables.yml
@@ -0,0 +1,8 @@
+---
+name: automatic_lock_writes_on_partition_tables
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132517
+rollout_issue_url:
+milestone: '16.5'
+type: ops
+group: group::tenant scale
+default_enabled: true
diff --git a/config/feature_flags/ops/block_password_auth_for_saml_users.yml b/config/feature_flags/ops/block_password_auth_for_saml_users.yml
index d84d8b5133b..ffc04d14a19 100644
--- a/config/feature_flags/ops/block_password_auth_for_saml_users.yml
+++ b/config/feature_flags/ops/block_password_auth_for_saml_users.yml
@@ -4,5 +4,5 @@ introduced_by_url:
rollout_issue_url:
milestone: '13.11'
type: ops
-group: group::authentication and authorization
+group: group::authentication
default_enabled: false
diff --git a/config/feature_flags/ops/code_suggestions_tokens_api.yml b/config/feature_flags/ops/code_suggestions_tokens_api.yml
index 9fc2a5358cc..2de8afc0428 100644
--- a/config/feature_flags/ops/code_suggestions_tokens_api.yml
+++ b/config/feature_flags/ops/code_suggestions_tokens_api.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/120892
rollout_issue_url:
milestone: '16.1'
type: ops
-group: group::ai assisted
+group: group::ai model validation
default_enabled: true
diff --git a/config/feature_flags/ops/enforce_ci_builds_pagination_limit.yml b/config/feature_flags/ops/enforce_ci_builds_pagination_limit.yml
new file mode 100644
index 00000000000..b5f44795c20
--- /dev/null
+++ b/config/feature_flags/ops/enforce_ci_builds_pagination_limit.yml
@@ -0,0 +1,8 @@
+---
+name: enforce_ci_builds_pagination_limit
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135162
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/429453
+milestone: '16.6'
+type: ops
+group: group::pipeline execution
+default_enabled: false
diff --git a/config/feature_flags/ops/enforce_memory_watchdog.yml b/config/feature_flags/ops/enforce_memory_watchdog.yml
index ae0ab81f9f6..e87e897d223 100644
--- a/config/feature_flags/ops/enforce_memory_watchdog.yml
+++ b/config/feature_flags/ops/enforce_memory_watchdog.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91910
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367534
milestone: '15.2'
type: ops
-group: group::application performance
+group: group::cloud connector
default_enabled: true
diff --git a/config/feature_flags/ops/report_heap_dumps.yml b/config/feature_flags/ops/report_heap_dumps.yml
index 12b126a8f80..9583ebd9970 100644
--- a/config/feature_flags/ops/report_heap_dumps.yml
+++ b/config/feature_flags/ops/report_heap_dumps.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106406
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385175
milestone: '15.7'
type: ops
-group: group::application performance
+group: group::cloud connector
default_enabled: false
diff --git a/config/feature_flags/ops/report_jemalloc_stats.yml b/config/feature_flags/ops/report_jemalloc_stats.yml
index 61fbfa26206..f2a34dae232 100644
--- a/config/feature_flags/ops/report_jemalloc_stats.yml
+++ b/config/feature_flags/ops/report_jemalloc_stats.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91283
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367845
milestone: '15.2'
type: ops
-group: group::application performance
+group: group::cloud connector
default_enabled: false
diff --git a/config/feature_flags/ops/suggested_reviewers_internal_api.yml b/config/feature_flags/ops/suggested_reviewers_internal_api.yml
index 44e197307a5..62cdf94a5b9 100644
--- a/config/feature_flags/ops/suggested_reviewers_internal_api.yml
+++ b/config/feature_flags/ops/suggested_reviewers_internal_api.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106648
rollout_issue_url:
milestone: '15.7'
type: ops
-group: group::ai assisted
+group: group::ai model validation
default_enabled: true
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index e2e5c37aa43..1e5fb17c971 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -183,6 +183,7 @@ Settings.gitlab['default_project_creation'] ||= ::Gitlab::Access::DEVELOPER_MAIN
Settings.gitlab['default_project_deletion_protection'] ||= false
Settings.gitlab['default_projects_limit'] ||= 100000
Settings.gitlab['default_branch_protection'] ||= 2
+Settings.gitlab['default_branch_protection_defaults'] ||= ::Gitlab::Access::BranchProtection.protected_fully
# `default_can_create_group` is deprecated since GitLab 15.5 in favour of the `can_create_group` column on `ApplicationSetting`.
Settings.gitlab['default_can_create_group'] = true if Settings.gitlab['default_can_create_group'].nil?
Settings.gitlab['default_theme'] = Gitlab::Themes::APPLICATION_DEFAULT if Settings.gitlab['default_theme'].nil?
@@ -799,15 +800,9 @@ Gitlab.ee do
Settings.cron_jobs['llm_embedding_gitlab_documentation_create_empty_embeddings_records_worker'] ||= {}
Settings.cron_jobs['llm_embedding_gitlab_documentation_create_empty_embeddings_records_worker']['cron'] ||= '0 5 * * 1,2,3,4,5'
Settings.cron_jobs['llm_embedding_gitlab_documentation_create_empty_embeddings_records_worker']['job_class'] ||= 'Llm::Embedding::GitlabDocumentation::CreateEmptyEmbeddingsRecordsWorker'
- Settings.cron_jobs['tanuki_bot_recreate_records_worker'] ||= {}
- Settings.cron_jobs['tanuki_bot_recreate_records_worker']['cron'] ||= '0 5 * * 1,2,3,4,5'
- Settings.cron_jobs['tanuki_bot_recreate_records_worker']['job_class'] ||= 'Llm::TanukiBot::RecreateRecordsWorker'
Settings.cron_jobs['llm_embedding_gitlab_documentation_cleanup_previous_versions_records_worker'] ||= {}
Settings.cron_jobs['llm_embedding_gitlab_documentation_cleanup_previous_versions_records_worker']['cron'] ||= '0 0 * * *'
Settings.cron_jobs['llm_embedding_gitlab_documentation_cleanup_previous_versions_records_worker']['job_class'] ||= 'Llm::Embedding::GitlabDocumentation::CleanupPreviousVersionsRecordsWorker'
- Settings.cron_jobs['tanuki_bot_remove_previous_records_worker'] ||= {}
- Settings.cron_jobs['tanuki_bot_remove_previous_records_worker']['cron'] ||= '0 0 * * *'
- Settings.cron_jobs['tanuki_bot_remove_previous_records_worker']['job_class'] ||= 'Llm::TanukiBot::RemovePreviousRecordsWorker'
Settings.cron_jobs['users_create_statistics_worker'] ||= {}
Settings.cron_jobs['users_create_statistics_worker']['cron'] ||= '2 15 * * *'
Settings.cron_jobs['users_create_statistics_worker']['job_class'] = 'Users::CreateStatisticsWorker'
@@ -874,6 +869,9 @@ Gitlab.ee do
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'
+ Settings.cron_jobs['timeout_pending_status_check_responses_worker'] ||= {}
+ Settings.cron_jobs['timeout_pending_status_check_responses_worker']['cron'] ||= '*/1 * * * *'
+ Settings.cron_jobs['timeout_pending_status_check_responses_worker']['job_class'] = 'ComplianceManagement::TimeoutPendingStatusCheckResponsesWorker'
Gitlab.com do
Settings.cron_jobs['disable_legacy_open_source_license_for_inactive_projects'] ||= {}
diff --git a/config/initializers/7_redis.rb b/config/initializers/7_redis.rb
index 060d0a8a67b..25c2c6aa11f 100644
--- a/config/initializers/7_redis.rb
+++ b/config/initializers/7_redis.rb
@@ -27,6 +27,10 @@ Redis::Cluster::SlotLoader.prepend(Gitlab::Patch::SlotLoader)
Redis::Cluster::CommandLoader.prepend(Gitlab::Patch::CommandLoader)
Redis::Cluster.prepend(Gitlab::Patch::RedisCluster)
+if Gitlab::Redis::Workhorse.params[:cluster].present?
+ raise "Do not configure workhorse with a Redis Cluster as pub/sub commands are not cluster-compatible."
+end
+
# Make sure we initialize a Redis connection pool before multi-threaded
# execution starts by
# 1. Sidekiq
diff --git a/config/initializers/action_cable.rb b/config/initializers/action_cable.rb
index 6d7f0497cd0..fb52ac6eb8a 100644
--- a/config/initializers/action_cable.rb
+++ b/config/initializers/action_cable.rb
@@ -11,15 +11,20 @@ end
ActionCable::SubscriptionAdapter::Base.prepend(Gitlab::Patch::ActionCableSubscriptionAdapterIdentifier)
+using_redis_cluster = begin
+ Rails.application.config_for(:cable)[:cluster].present?
+rescue RuntimeError
+ # config/cable.yml does not exist, but that is not the purpose of this check
+end
+
+raise "Do not configure cable.yml with a Redis Cluster as ActionCable only works with Redis." if using_redis_cluster
+
# https://github.com/rails/rails/blob/bb5ac1623e8de08c1b7b62b1368758f0d3bb6379/actioncable/lib/action_cable/subscription_adapter/redis.rb#L18
ActionCable::SubscriptionAdapter::Redis.redis_connector = lambda do |config|
args = config.except(:adapter, :channel_prefix)
.merge(instrumentation_class: ::Gitlab::Instrumentation::Redis::ActionCable)
- primary_store = ::Redis.new(Gitlab::Redis::Pubsub.params)
- secondary_store = ::Redis.new(args)
-
- Gitlab::Redis::MultiStore.new(primary_store, secondary_store, "ActionCable")
+ ::Redis.new(args)
end
Gitlab::ActionCable::RequestStoreCallbacks.install
diff --git a/config/initializers/active_record_renamed_table.rb b/config/initializers/active_record_renamed_table.rb
index 948ef8790c8..5a9e30d2fb5 100644
--- a/config/initializers/active_record_renamed_table.rb
+++ b/config/initializers/active_record_renamed_table.rb
@@ -1,5 +1,9 @@
# frozen_string_literal: true
ActiveSupport.on_load(:active_record) do
- ActiveRecord::ConnectionAdapters::SchemaCache.prepend(Gitlab::Database::SchemaCacheWithRenamedTable)
+ if Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new('7.1')
+ ActiveRecord::ConnectionAdapters::SchemaCache.prepend(Gitlab::Database::SchemaCacheWithRenamedTable)
+ else
+ ActiveRecord::ConnectionAdapters::SchemaCache.prepend(Gitlab::Database::SchemaCacheWithRenamedTableLegacy)
+ end
end
diff --git a/config/initializers/database_query_analyzers.rb b/config/initializers/database_query_analyzers.rb
index 5c2f3caf89e..9facd822e5c 100644
--- a/config/initializers/database_query_analyzers.rb
+++ b/config/initializers/database_query_analyzers.rb
@@ -9,7 +9,10 @@ Gitlab::Database::QueryAnalyzer.instance.tap do |query_analyzer|
analyzers.append(::Gitlab::Database::QueryAnalyzers::PreventCrossDatabaseModification)
analyzers.append(::Gitlab::Database::QueryAnalyzers::Ci::PartitioningRoutingAnalyzer)
- analyzers.append(::Gitlab::Database::QueryAnalyzers::GitlabSchemasValidateConnection) if Gitlab.dev_or_test_env?
+ if Gitlab.dev_or_test_env?
+ analyzers.append(::Gitlab::Database::QueryAnalyzers::GitlabSchemasValidateConnection)
+ analyzers.append(::Gitlab::Database::QueryAnalyzers::PreventSetOperatorMismatch)
+ end
end
end
diff --git a/config/initializers/elastic_client_setup.rb b/config/initializers/elastic_client_setup.rb
index dd68a3f7999..5fe26d7bd92 100644
--- a/config/initializers/elastic_client_setup.rb
+++ b/config/initializers/elastic_client_setup.rb
@@ -19,6 +19,9 @@ Gitlab.ee do
Elasticsearch::Model::ClassMethods.prepend GemExtensions::Elasticsearch::Model::Client
Elasticsearch::Model.singleton_class.prepend GemExtensions::Elasticsearch::Model::Client
+ require 'elasticsearch/api'
+ Elasticsearch::API::Utils.prepend GemExtensions::Elasticsearch::API::Utils
+
### Modified from elasticsearch-model/lib/elasticsearch/model/searching.rb
module Elasticsearch
diff --git a/config/initializers/peek.rb b/config/initializers/peek.rb
index 6ac116f46f5..e1c59851fb1 100644
--- a/config/initializers/peek.rb
+++ b/config/initializers/peek.rb
@@ -16,7 +16,6 @@ Peek.into Peek::Views::Gitaly
Peek.into Peek::Views::RedisDetailed
Peek.into Peek::Views::Elasticsearch
Peek.into Peek::Views::Zoekt
-Peek.into Peek::Views::Rugged
Peek.into Peek::Views::ExternalHttp
Peek.into Peek::Views::ClickHouse
Peek.into Peek::Views::BulletDetailed if defined?(Bullet)
diff --git a/config/initializers/postgresql_cte.rb b/config/initializers/postgresql_cte.rb
index 7f0196197b9..40d959c1ba0 100644
--- a/config/initializers/postgresql_cte.rb
+++ b/config/initializers/postgresql_cte.rb
@@ -40,6 +40,8 @@ module ActiveRecord::Querying
delegate :with, to: :all
end
+# Rails 7.1 defines #with method.
+# Therefore, this file can be either simplified or completely removed.
module ActiveRecord
class Relation
# WithChain objects act as placeholder for queries in which #with does not have any parameter.
@@ -51,21 +53,21 @@ module ActiveRecord
# Returns a new relation expressing WITH RECURSIVE
def recursive(*args)
- @scope.with_values += args
+ @scope.with_values_ += args
@scope.recursive_value = true
@scope.extend(Gitlab::Database::ReadOnlyRelation)
@scope
end
end
- def with_values
- @values[:with] || []
+ def with_values_
+ @values[:with_values] || []
end
- def with_values=(values)
+ def with_values_=(values)
raise ImmutableRelation if @loaded
- @values[:with] = values
+ @values[:with_values] = values
end
def recursive_value=(value)
@@ -92,7 +94,7 @@ module ActiveRecord
if opts == :chain
WithChain.new(self)
else
- self.with_values += [opts] + rest
+ self.with_values_ += [opts] + rest
self
end
end
@@ -100,13 +102,13 @@ module ActiveRecord
def build_arel(aliases = nil)
arel = super
- build_with(arel) if @values[:with]
+ build_with(arel) if @values[:with_values]
arel
end
def build_with(arel)
- with_statements = with_values.flat_map do |with_value|
+ with_statements = with_values_.flat_map do |with_value|
case with_value
when String
with_value
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 57850e4e35c..9b6a9b17935 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -30,10 +30,6 @@ end
# Custom Queues configuration
queues_config_hash = Gitlab::Redis::Queues.params
-unless Gitlab::Utils.to_boolean(ENV['SIDEKIQ_ENQUEUE_NON_NAMESPACED'])
- queues_config_hash[:namespace] = Gitlab::Redis::Queues::SIDEKIQ_NAMESPACE
-end
-
enable_json_logs = Gitlab.config.sidekiq.log_format != 'text'
Sidekiq.configure_server do |config|
diff --git a/config/initializers/sprockets_patch.rb b/config/initializers/sprockets_patch.rb
new file mode 100644
index 00000000000..76474b370be
--- /dev/null
+++ b/config/initializers/sprockets_patch.rb
@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+# This backports https://github.com/rails/sprockets/pull/759 to Sprockets v3.7.2 to
+# fix thread-safety issues with compiling SASS.
+#
+# This pull request has already been merged in Sprockets v4.2.0, but we
+# don't plan on upgrading: https://gitlab.com/gitlab-org/gitlab/-/issues/373997#note_1360248557
+
+require 'sprockets/utils'
+
+unless Gem::Version.new(Sprockets::VERSION) == Gem::Version.new('3.7.2')
+ raise 'New version of Sprockets detected. This patch can likely be removed.'
+end
+
+# rubocop:disable Style/CombinableLoops -- Keep the format consistent with upstream project
+# rubocop:disable Cop/LineBreakAroundConditionalBlock -- Keep the format consistent with upstream project
+# rubocop:disable Style/IfUnlessModifier -- Keep the format consistent with upstream project
+# rubocop:disable Style/SoleNestedConditional -- Keep the format consistent with upstream project
+module Sprockets
+ module Utils
+ extend self
+
+ MODULE_INCLUDE_MUTEX = Mutex.new
+ private_constant :MODULE_INCLUDE_MUTEX
+
+ # Internal: Inject into target module for the duration of the block.
+ #
+ # mod - Module
+ #
+ # Returns result of block.
+ def module_include(base, mod)
+ MODULE_INCLUDE_MUTEX.synchronize do
+ old_methods = {}
+
+ mod.instance_methods.each do |sym|
+ old_methods[sym] = base.instance_method(sym) if base.method_defined?(sym)
+ end
+
+ unless UNBOUND_METHODS_BIND_TO_ANY_OBJECT
+ base.send(:include, mod) unless base < mod
+ end
+
+ mod.instance_methods.each do |sym|
+ method = mod.instance_method(sym)
+ base.send(:define_method, sym, method)
+ end
+
+ yield
+ ensure
+ mod.instance_methods.each do |sym|
+ base.send(:undef_method, sym) if base.method_defined?(sym)
+ end
+ old_methods.each do |sym, method|
+ base.send(:define_method, sym, method)
+ end
+ end
+ end
+ end
+end
+# rubocop:enable Style/CombinableLoops
+# rubocop:enable Cop/LineBreakAroundConditionalBlock
+# rubocop:enable Style/IfUnlessModifier
+# rubocop:enable Style/SoleNestedConditional
diff --git a/config/initializers/wikicloth_redos_patch.rb b/config/initializers/wikicloth_redos_patch.rb
index 95901378891..501a4084edc 100644
--- a/config/initializers/wikicloth_redos_patch.rb
+++ b/config/initializers/wikicloth_redos_patch.rb
@@ -94,7 +94,7 @@ module WikiCloth
data << "\n" if data.last(1) != "\n"
data << "garbage"
- buffer = WikiBuffer.new("",options)
+ buffer = WikiBuffer.new(+'',options)
begin
if self.options[:fast]
diff --git a/config/mail_room.yml b/config/mail_room.yml
index b453ed8ce35..355df13fd61 100644
--- a/config/mail_room.yml
+++ b/config/mail_room.yml
@@ -31,7 +31,6 @@
:delivery_options:
:redis_url: <%= config[:redis_url].to_json %>
:redis_db: <%= config[:redis_db] %>
- :namespace: <%= Gitlab::Redis::Queues::SIDEKIQ_NAMESPACE %>
:queue: <%= config[:queue] %>
:worker: <%= config[:worker] %>
<% if config[:sentinels] %>
diff --git a/config/metrics/counts_28d/20231102160653_i_quickactions_request_changes_monthly.yml b/config/metrics/counts_28d/20231102160653_i_quickactions_request_changes_monthly.yml
new file mode 100644
index 00000000000..970c49e3962
--- /dev/null
+++ b/config/metrics/counts_28d/20231102160653_i_quickactions_request_changes_monthly.yml
@@ -0,0 +1,23 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_request_changes_monthly
+description: Count using the `/request_changes` quick action on Merge Requests
+product_section: dev
+product_stage: create
+product_group: code_review
+value_type: number
+status: active
+milestone: '16.6'
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+ events:
+ - i_quickactions_request_changes
+distribution:
+ - ce
+ - ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_7d/20231102160653_i_quickactions_request_changes_weekly.yml b/config/metrics/counts_7d/20231102160653_i_quickactions_request_changes_weekly.yml
new file mode 100644
index 00000000000..e529dfd4e51
--- /dev/null
+++ b/config/metrics/counts_7d/20231102160653_i_quickactions_request_changes_weekly.yml
@@ -0,0 +1,23 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_request_changes_weekly
+description: Count using the `/request_changes` quick action on Merge Requests
+product_section: dev
+product_stage: create
+product_group: code_review
+value_type: number
+status: active
+milestone: '16.6'
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+ events:
+ - i_quickactions_request_changes
+distribution:
+ - ce
+ - ee
+tier:
+ - free
+ - premium
+ - ultimate
diff --git a/config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml b/config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml
index 5bf8e1d6e78..c9c85bca415 100644
--- a/config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml
+++ b/config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml
@@ -6,7 +6,7 @@ product_section: dev
product_stage: manage
product_group: integrations
value_type: number
-status: active
+status: removed
time_frame: all
data_source: database
instrumentation_class: CountProjectsWithJiraDvcsIntegrationMetric
@@ -21,3 +21,5 @@ tier:
- ultimate
performance_indicator_type: []
milestone: "<13.9"
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135755
+milestone_removed: "<16.6"
diff --git a/config/metrics/schema.json b/config/metrics/schema/base.json
index fe53b92f7de..5f571566651 100644
--- a/config/metrics/schema.json
+++ b/config/metrics/schema/base.json
@@ -87,28 +87,6 @@
"options": {
"type": "object"
},
- "events": {
- "type": "array",
- "items": {
- "type": "object",
- "required": [
- "name"
- ],
- "properties": {
- "name": {
- "type": "string"
- },
- "unique": {
- "type": "string",
- "enum": [
- "user.id",
- "project.id",
- "namespace.id"
- ]
- }
- }
- }
- },
"time_frame": {
"type": "string",
"enum": [
@@ -188,50 +166,5 @@
"value_json_schema": {
"type": "string"
}
- },
- "allOf": [
- {
- "if": {
- "properties": {
- "status": {
- "const": "broken"
- }
- }
- },
- "then": {
- "required": [
- "repair_issue_url"
- ]
- }
- },
- {
- "if": {
- "properties": {
- "data_source": {
- "const": "internal_events"
- }
- }
- },
- "then": {
- "required": [
- "events"
- ]
- }
- },
- {
- "if": {
- "properties": {
- "status": {
- "const": "removed"
- }
- }
- },
- "then": {
- "required": [
- "removed_by_url",
- "milestone_removed"
- ]
- }
- }
- ]
+ }
}
diff --git a/config/metrics/schema/internal_events.json b/config/metrics/schema/internal_events.json
new file mode 100644
index 00000000000..75378db054d
--- /dev/null
+++ b/config/metrics/schema/internal_events.json
@@ -0,0 +1,106 @@
+{
+ "if": {
+ "properties": {
+ "data_source": {
+ "const": "internal_events"
+ }
+ }
+ },
+ "then": {
+ "oneOf": [
+ {
+ "properties": {
+ "instrumentation_class": {
+ "const": "RedisHLLMetric"
+ },
+ "options": {
+ "type": "object",
+ "properties": {
+ "events": {
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ }
+ },
+ "required": [
+ "events"
+ ],
+ "additionalProperties": false
+ },
+ "events": {
+ "type": "array",
+ "items": {
+ "type": "object",
+ "required": [
+ "name",
+ "unique"
+ ],
+ "properties": {
+ "name": {
+ "type": "string"
+ },
+ "unique": {
+ "type": "string",
+ "enum": [
+ "user.id",
+ "project.id",
+ "namespace.id"
+ ]
+ }
+ },
+ "additionalProperties": false
+ }
+ }
+ },
+ "required": [
+ "events",
+ "options",
+ "instrumentation_class"
+ ]
+ },
+ {
+ "properties": {
+ "instrumentation_class": {
+ "const": "TotalCountMetric"
+ },
+ "options": {
+ "type": "object",
+ "properties": {
+ "events": {
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ }
+ },
+ "required": [
+ "events"
+ ],
+ "additionalProperties": false
+ },
+ "events": {
+ "type": "array",
+ "items": {
+ "type": "object",
+ "required": [
+ "name"
+ ],
+ "properties": {
+ "name": {
+ "type": "string"
+ }
+ },
+ "additionalProperties": false
+ }
+ }
+ },
+ "required": [
+ "events",
+ "options",
+ "instrumentation_class"
+ ]
+ }
+ ]
+ }
+}
diff --git a/config/metrics/schema/redis.json b/config/metrics/schema/redis.json
new file mode 100644
index 00000000000..3fe3ba3e7ec
--- /dev/null
+++ b/config/metrics/schema/redis.json
@@ -0,0 +1,95 @@
+{
+ "if": {
+ "properties": {
+ "data_source": {
+ "const": "redis"
+ }
+ }
+ },
+ "then": {
+ "oneOf": [
+ {
+ "properties": {
+ "instrumentation_class": {
+ "const": "MergeRequestWidgetExtensionMetric"
+ },
+ "options": {
+ "type": "object",
+ "properties": {
+ "event": {
+ "type": "string"
+ },
+ "widget": {
+ "type": "string"
+ }
+ },
+ "required": [
+ "event",
+ "widget"
+ ],
+ "additionalProperties": false
+ }
+ },
+ "required": [
+ "instrumentation_class",
+ "options"
+ ]
+ },
+ {
+ "properties": {
+ "instrumentation_class": {
+ "const": "RedisMetric"
+ },
+ "options": {
+ "type": "object",
+ "properties": {
+ "event": {
+ "type": "string"
+ },
+ "prefix": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "include_usage_prefix": {
+ "type": "boolean"
+ }
+ },
+ "required": [
+ "event",
+ "prefix"
+ ],
+ "additionalProperties": false
+ }
+ },
+ "required": [
+ "instrumentation_class",
+ "options"
+ ]
+ },
+ {
+ "properties": {
+ "key_path": {
+ "description": "Legacy metrics that do not match with the schema",
+ "enum": [
+ "counts.dependency_list_usages_total",
+ "counts.network_policy_forwards",
+ "counts.network_policy_drops",
+ "counts.static_site_editor_views",
+ "counts.static_site_editor_commits",
+ "counts.static_site_editor_merge_requests",
+ "counts.package_events_i_package_container_delete_package",
+ "counts.package_events_i_package_container_pull_package",
+ "counts.package_events_i_package_container_push_package",
+ "counts.package_events_i_package_debian_push_package",
+ "counts.package_events_i_package_tag_delete_package",
+ "counts.package_events_i_package_tag_pull_package",
+ "counts.package_events_i_package_tag_push_package"
+ ]
+ }
+ }
+ }
+ ]
+ }
+}
diff --git a/config/metrics/schema/redis_hll.json b/config/metrics/schema/redis_hll.json
new file mode 100644
index 00000000000..35d520a5833
--- /dev/null
+++ b/config/metrics/schema/redis_hll.json
@@ -0,0 +1,103 @@
+{
+ "if": {
+ "properties": {
+ "data_source": {
+ "const": "redis_hll"
+ }
+ }
+ },
+ "then": {
+ "oneOf": [
+ {
+ "properties": {
+ "instrumentation_class": {
+ "const": "RedisHLLMetric"
+ },
+ "options": {
+ "type": "object",
+ "properties": {
+ "events": {
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ }
+ },
+ "required": [
+ "events"
+ ],
+ "additionalProperties": false
+ }
+ },
+ "required": [
+ "instrumentation_class",
+ "options"
+ ]
+ },
+ {
+ "properties": {
+ "instrumentation_class": {
+ "const": "AggregatedMetric"
+ },
+ "options": {
+ "type": "object",
+ "properties": {
+ "aggregate": {
+ "type": "object",
+ "properties": {
+ "operator": {
+ "enum": [
+ "OR",
+ "AND"
+ ]
+ },
+ "attribute": {
+ "type": "string"
+ }
+ },
+ "required": [
+ "operator",
+ "attribute"
+ ],
+ "additionalProperties": false
+ },
+ "events": {
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ }
+ },
+ "required": [
+ "aggregate",
+ "events"
+ ],
+ "additionalProperties": false
+ }
+ },
+ "required": [
+ "instrumentation_class",
+ "options"
+ ]
+ },
+ {
+ "properties": {
+ "key_path": {
+ "description": "Legacy metrics that do not match with the schema",
+ "enum": [
+ "usage_activity_by_stage_monthly.create.merge_requests_users",
+ "usage_activity_by_stage_monthly.create.action_monthly_active_users_web_ide_edit",
+ "usage_activity_by_stage_monthly.create.action_monthly_active_users_sfe_edit",
+ "usage_activity_by_stage_monthly.create.action_monthly_active_users_snippet_editor_edit",
+ "usage_activity_by_stage_monthly.create.action_monthly_active_users_sse_edit",
+ "counts_monthly.aggregated_metrics.product_analytics_test_metrics_union",
+ "counts_weekly.aggregated_metrics.product_analytics_test_metrics_union",
+ "counts_monthly.aggregated_metrics.product_analytics_test_metrics_intersection",
+ "counts_weekly.aggregated_metrics.product_analytics_test_metrics_intersection"
+ ]
+ }
+ }
+ }
+ ]
+ }
+}
diff --git a/config/metrics/schema/status.json b/config/metrics/schema/status.json
new file mode 100644
index 00000000000..7b71a22b4c6
--- /dev/null
+++ b/config/metrics/schema/status.json
@@ -0,0 +1,33 @@
+{
+ "allOf": [
+ {
+ "if": {
+ "properties": {
+ "status": {
+ "const": "broken"
+ }
+ }
+ },
+ "then": {
+ "required": [
+ "repair_issue_url"
+ ]
+ }
+ },
+ {
+ "if": {
+ "properties": {
+ "status": {
+ "const": "removed"
+ }
+ }
+ },
+ "then": {
+ "required": [
+ "removed_by_url",
+ "milestone_removed"
+ ]
+ }
+ }
+ ]
+}
diff --git a/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml b/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
index a206d8ecd7a..a04e8d82686 100644
--- a/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
+++ b/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
@@ -6,7 +6,7 @@ product_section: dev
product_stage: create
product_group: ide
value_type: boolean
-status: active
+status: removed
time_frame: none
data_source: database
distribution:
@@ -18,3 +18,5 @@ tier:
- ultimate
performance_indicator_type: []
milestone: "<13.9"
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136114
+milestone_removed: "16.6"
diff --git a/config/redis.yml.example b/config/redis.yml.example
index 9d884038af7..a391ae36a65 100644
--- a/config/redis.yml.example
+++ b/config/redis.yml.example
@@ -18,6 +18,11 @@ development:
queues_metadata:
cluster:
- redis://localhost:7001
+ shared_state:
+ cluster:
+ - redis://localhost:7001
+ workhorse:
+ url: redis://localhost:6379
test:
chat:
@@ -38,3 +43,10 @@ test:
queues_metadata:
cluster:
- redis://localhost:7001
+ shared_state:
+ cluster:
+ - redis://localhost:7001
+ # pubsub and workhorse are not redis-cluster compatible
+ # even though they fall-back to shared_state
+ workhorse:
+ url: redis://localhost:6379
diff --git a/config/routes.rb b/config/routes.rb
index 82b2ef84a64..80a30372f5a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -31,16 +31,6 @@ InitializerConnections.raise_if_new_database_connection do
end
put '/oauth/applications/:id/renew(.:format)' => 'oauth/applications#renew', as: :renew_oauth_application
- # This prefixless path is required because Jira gets confused if we set it up with a path
- # More information: https://gitlab.com/gitlab-org/gitlab/issues/6752
- scope path: '/login/oauth', controller: 'oauth/jira_dvcs/authorizations', as: :oauth_jira_dvcs do
- get :authorize, action: :new
- get :callback
- post :access_token
-
- match '*all', via: [:get, :post], to: proc { [404, {}, ['']] }
- end
-
draw :oauth
use_doorkeeper_openid_connect do
@@ -98,6 +88,7 @@ InitializerConnections.raise_if_new_database_connection do
get '/autocomplete/projects' => 'autocomplete#projects'
get '/autocomplete/award_emojis' => 'autocomplete#award_emojis'
get '/autocomplete/merge_request_target_branches' => 'autocomplete#merge_request_target_branches'
+ get '/autocomplete/merge_request_source_branches' => 'autocomplete#merge_request_source_branches'
get '/autocomplete/deploy_keys_with_owners' => 'autocomplete#deploy_keys_with_owners'
Gitlab.ee do
@@ -229,6 +220,8 @@ InitializerConnections.raise_if_new_database_connection do
get '/timelogs' => 'time_tracking/timelogs#index'
post '/track_namespace_visits' => 'users/namespace_visits#create'
+
+ get '/external_redirect' => 'external_redirect/external_redirect#index'
end
# End of the /-/ scope.
diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index 5513ac1813a..bb59435729e 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -22,6 +22,8 @@ namespace :admin do
put :unlock
put :confirm
put :approve
+ put :trust
+ put :untrust
delete :reject
post :impersonate
patch :disable_two_factor
@@ -161,7 +163,6 @@ namespace :admin do
get :lets_encrypt_terms_of_service
get :slack_app_manifest_download, format: :json
get :slack_app_manifest_share
- get :service_usage_data
resource :appearances, only: [:show, :create, :update], path: 'appearance', module: 'application_settings' do
member do
diff --git a/config/routes/explore.rb b/config/routes/explore.rb
index 6777571bb68..36c2432d0cc 100644
--- a/config/routes/explore.rb
+++ b/config/routes/explore.rb
@@ -11,6 +11,7 @@ namespace :explore do
end
resources :groups, only: [:index]
+ resources :catalog, only: [:index, :show], constraints: { id: /\d+/ }
resources :snippets, only: [:index]
root to: 'projects#index'
end
diff --git a/config/routes/import.rb b/config/routes/import.rb
index 26843b4bc8d..274611283b5 100644
--- a/config/routes/import.rb
+++ b/config/routes/import.rb
@@ -74,6 +74,7 @@ namespace :import do
get :status
get :realtime_changes
get :history
+ get :details
end
resource :manifest, only: [:create, :new], controller: :manifest do
diff --git a/config/routes/organizations.rb b/config/routes/organizations.rb
index d53cfdf1a4e..62c791cdf69 100644
--- a/config/routes/organizations.rb
+++ b/config/routes/organizations.rb
@@ -8,6 +8,7 @@ resources(
) do
member do
get :groups_and_projects
+ get :users
resource :settings, only: [], as: :settings_organization do
get :general
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 8ed8574d0cc..947ed6b5413 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -69,6 +69,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
get :raw
get :terminal
get :proxy
+ get :test_report_summary
# These routes are also defined in gitlab-workhorse. Make sure to update accordingly.
get '/terminal.ws/authorize', to: 'jobs#terminal_websocket_authorize', format: false
@@ -461,7 +462,9 @@ 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, :show], controller: 'models', param: :model_id
+ resources :models, only: [:index, :show, :destroy], controller: 'models', param: :model_id do
+ resources :versions, only: [:show], controller: 'model_versions', param: :model_version_id
+ end
end
namespace :service_desk do
diff --git a/config/settings.rb b/config/settings.rb
index 9abbbc11899..3edbcc9b5ed 100644
--- a/config/settings.rb
+++ b/config/settings.rb
@@ -3,10 +3,11 @@
require_relative '../lib/gitlab_settings'
file = ENV.fetch('GITLAB_CONFIG') { Rails.root.join('config/gitlab.yml') }
+section = ENV.fetch('GITLAB_ENV') { Rails.env }
GITLAB_INSTANCE_UUID_NOT_SET = 'uuid-not-set'
-Settings = GitlabSettings.load(file, Rails.env) do
+Settings = GitlabSettings.load(file, section) do
def gitlab_on_standard_port?
on_standard_port?(gitlab)
end
diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml
index 1f0b4840a8e..210a246978a 100644
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -25,6 +25,10 @@
:queues:
- - abuse_new_abuse_report
- 1
+- - abuse_spam_abuse_events
+ - 1
+- - activity_pub
+ - 1
- - adjourned_project_deletion
- 1
- - admin_emails
@@ -273,6 +277,8 @@
- 2
- - emails_on_push
- 2
+- - environments_auto_recover
+ - 1
- - environments_auto_stop
- 1
- - environments_canary_ingress_update
@@ -349,8 +355,6 @@
- 1
- - groups_update_two_factor_requirement_for_members
- 1
-- - hashed_storage
- - 1
- - import_issues_csv
- 2
- - incident_management
@@ -411,8 +415,6 @@
- 1
- - llm_namespace_access_cache_reset
- 1
-- - llm_tanuki_bot_update
- - 1
- - llm_vertex_ai_access_token_refresh
- 1
- - mail_scheduler
@@ -471,6 +473,8 @@
- 1
- - ml_experiment_tracking_associate_ml_candidate_to_package
- 1
+- - namespaces_free_user_cap_group_over_limit_notification
+ - 1
- - namespaces_process_sync_events
- 1
- - namespaces_storage_usage_export
@@ -505,6 +509,8 @@
- 1
- - package_metadata_advisory_scan
- 1
+- - package_metadata_global_advisory_scan
+ - 1
- - package_repositories
- 1
- - packages_composer_cache_update
@@ -557,6 +563,8 @@
- 1
- - projects_git_garbage_collect
- 1
+- - projects_import_export_after_import_merge_requests
+ - 1
- - projects_import_export_create_relation_exports
- 1
- - projects_import_export_parallel_project_export
@@ -659,8 +667,6 @@
- 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
- 1
- - security_scans
@@ -689,8 +695,6 @@
- 1
- - system_hook_push
- 1
-- - tasks_to_be_done_create
- - 1
- - terraform
- 1
- - todos_destroyer
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 8b45b25a328..2977b1ce712 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -184,11 +184,6 @@ function generateEntries() {
const alias = {
// Map Apollo client to apollo/client/core to prevent react related imports from being loaded
'@apollo/client$': '@apollo/client/core',
- // Map Sentry calls to use local wrapper
- '@sentry/browser$': path.join(
- ROOT_PATH,
- 'app/assets/javascripts/sentry/sentry_browser_wrapper.js',
- ),
'~': path.join(ROOT_PATH, 'app/assets/javascripts'),
emojis: path.join(ROOT_PATH, 'fixtures/emojis'),
images: path.join(ROOT_PATH, 'app/assets/images'),
@@ -388,6 +383,15 @@ module.exports = {
loader: 'babel-loader',
},
{
+ test: /swagger-ui-dist\/.*\.js?$/,
+ include: /node_modules/,
+ loader: 'babel-loader',
+ options: {
+ plugins: ['@babel/plugin-proposal-logical-assignment-operators'],
+ ...defaultJsOptions,
+ },
+ },
+ {
test: /\.(js|cjs)$/,
exclude: shouldExcludeFromCompliling,
use: [