diff options
Diffstat (limited to 'config')
118 files changed, 669 insertions, 319 deletions
diff --git a/config/application.rb b/config/application.rb index 76541daa9e1..aa1a0b26d60 100644 --- a/config/application.rb +++ b/config/application.rb @@ -69,18 +69,19 @@ module Gitlab require_dependency Rails.root.join('lib/gitlab/middleware/handle_malformed_strings') require_dependency Rails.root.join('lib/gitlab/middleware/rack_multipart_tempfile_factory') require_dependency Rails.root.join('lib/gitlab/runtime') - require_dependency Rails.root.join('lib/gitlab/patch/legacy_database_config') + require_dependency Rails.root.join('lib/gitlab/patch/database_config') require_dependency Rails.root.join('lib/gitlab/exceptions_app') config.exceptions_app = Gitlab::ExceptionsApp.new(Rails.public_path) - # To be removed in 15.0 - # This preload is needed to convert legacy `database.yml` - # from `production: adapter: postgresql` - # into a `production: main: adapter: postgresql` - unless Gitlab::Utils.to_boolean(ENV['SKIP_DATABASE_CONFIG_VALIDATION'], default: false) - config.class.prepend(::Gitlab::Patch::LegacyDatabaseConfig) - end + # This preload is required to: + # + # 1. Convert legacy `database.yml`; + # 2. Include Geo post-deployment migrations settings; + # + # TODO: In 15.0, this preload can be wrapped in a Gitlab.ee block + # since we don't need to convert legacy `database.yml` anymore. + config.class.prepend(::Gitlab::Patch::DatabaseConfig) # Settings in config/environments/* take precedence over those specified here. # Application configuration should go into files in config/initializers @@ -313,6 +314,8 @@ module Gitlab config.assets.precompile << "themes/*.css" config.assets.precompile << "highlight/themes/*.css" + config.assets.precompile << "highlight/diff_custom_colors_addition.css" + config.assets.precompile << "highlight/diff_custom_colors_deletion.css" # Import gitlab-svgs directly from vendored directory config.assets.paths << "#{config.root}/node_modules/@gitlab/svgs/dist" @@ -514,6 +517,14 @@ module Gitlab end end + # We run the contents of active_record.clear_active_connections again + # because we connect to database from routes + # https://github.com/rails/rails/blob/fdf840f69a2e33d78a9d40b91d9b7fddb76711e9/activerecord/lib/active_record/railtie.rb#L308 + initializer :clear_active_connections_again, after: :set_routes_reloader_hook do + ActiveRecord::Base.clear_active_connections! + ActiveRecord::Base.flush_idle_connections! + end + # DO NOT PLACE ANY INITIALIZERS AFTER THIS. config.after_initialize do # on_master_start yields immediately in unclustered environments and runs diff --git a/config/events/1649272430_projectsnew_visit_docs.yml b/config/events/1649272430_projectsnew_visit_docs.yml new file mode 100644 index 00000000000..8a058e12c3b --- /dev/null +++ b/config/events/1649272430_projectsnew_visit_docs.yml @@ -0,0 +1,18 @@ +--- +description: Docs link under the deployment target select visited from new project creation form +category: projects:new +action: visit_docs +label_description: new_project_deployment_target +product_section: ops +product_stage: configure +product_group: group::configure +milestone: "14.10" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84224 +distributions: +- ce +- ee +tiers: +- free +- premium +- ultimate + diff --git a/config/feature_categories.yml b/config/feature_categories.yml index c422d2da691..c991d3e3720 100644 --- a/config/feature_categories.yml +++ b/config/feature_categories.yml @@ -73,7 +73,6 @@ - internationalization - jenkins_importer - kubernetes_management -- license - license_compliance - logging - memory @@ -94,6 +93,7 @@ - privacy_control_center - product_analytics - projects +- provision - purchase - quality_management - redis @@ -120,7 +120,6 @@ - subgroups - team_planning - tracing -- usage_ping - users - utilization - value_stream_management diff --git a/config/feature_flags/experiment/bypass_registration.yml b/config/feature_flags/development/about_your_company_registration_flow.yml index b3a0d634248..424de7a9ba2 100644 --- a/config/feature_flags/experiment/bypass_registration.yml +++ b/config/feature_flags/development/about_your_company_registration_flow.yml @@ -1,8 +1,8 @@ --- -name: bypass_registration -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72827 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340560 -milestone: '14.5' -type: experiment +name: about_your_company_registration_flow +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83345 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/355909 +milestone: '14.10' +type: development group: group::adoption default_enabled: false diff --git a/config/feature_flags/development/admin_application_settings_service_usage_data_center.yml b/config/feature_flags/development/admin_application_settings_service_usage_data_center.yml deleted file mode 100644 index 465f9061eb4..00000000000 --- a/config/feature_flags/development/admin_application_settings_service_usage_data_center.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: admin_application_settings_service_usage_data_center -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78747 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/351268 -milestone: '14.8' -type: development -group: group::product intelligence -default_enabled: true diff --git a/config/feature_flags/development/track_error_tracking_activity.yml b/config/feature_flags/development/admin_runners_bulk_delete.yml index c21a8d1aede..ff285855e96 100644 --- a/config/feature_flags/development/track_error_tracking_activity.yml +++ b/config/feature_flags/development/admin_runners_bulk_delete.yml @@ -1,8 +1,8 @@ --- -name: track_error_tracking_activity -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82543 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/355112 +name: admin_runners_bulk_delete +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81894 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353981 milestone: '14.9' type: development -group: group::respond +group: group::runner default_enabled: false diff --git a/config/feature_flags/development/allow_non_blocking_member_refresh.yml b/config/feature_flags/development/allow_non_blocking_member_refresh.yml new file mode 100644 index 00000000000..44ab1c13e7e --- /dev/null +++ b/config/feature_flags/development/allow_non_blocking_member_refresh.yml @@ -0,0 +1,8 @@ +--- +name: allow_non_blocking_member_refresh +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83619 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/357281 +milestone: '14.10' +type: development +group: group::authentication and authorization +default_enabled: false diff --git a/config/feature_flags/development/arkose_labs_login_challenge.yml b/config/feature_flags/development/arkose_labs_login_challenge.yml new file mode 100644 index 00000000000..74c5d625aa3 --- /dev/null +++ b/config/feature_flags/development/arkose_labs_login_challenge.yml @@ -0,0 +1,8 @@ +--- +name: arkose_labs_login_challenge +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82751 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356171 +milestone: '14.10' +type: development +group: group::antiabuse +default_enabled: false diff --git a/config/feature_flags/development/arkose_labs_prevent_login.yml b/config/feature_flags/development/arkose_labs_prevent_login.yml new file mode 100644 index 00000000000..8d55fd6de3a --- /dev/null +++ b/config/feature_flags/development/arkose_labs_prevent_login.yml @@ -0,0 +1,8 @@ +--- +name: arkose_labs_prevent_login +introduced_by_url: +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/358838 +milestone: '14.10' +type: development +group: group::antiabuse +default_enabled: false diff --git a/config/feature_flags/development/ci_artifact_fast_removal_large_loop_limit.yml b/config/feature_flags/development/ci_artifact_fast_removal_large_loop_limit.yml deleted file mode 100644 index bfb036bcc00..00000000000 --- a/config/feature_flags/development/ci_artifact_fast_removal_large_loop_limit.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: ci_artifact_fast_removal_large_loop_limit -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76504 -rollout_issue_url: -milestone: '14.6' -type: development -group: group::pipeline execution -default_enabled: false diff --git a/config/feature_flags/development/ci_validate_job_length.yml b/config/feature_flags/development/ci_expand_environment_name_and_url.yml index 5e29d3c1435..58626cdfc46 100644 --- a/config/feature_flags/development/ci_validate_job_length.yml +++ b/config/feature_flags/development/ci_expand_environment_name_and_url.yml @@ -1,8 +1,8 @@ --- -name: ci_validate_job_length -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73599 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344665 -milestone: '14.5' +name: ci_expand_environment_name_and_url +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84969 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/358831 +milestone: '14.10' type: development group: group::pipeline authoring -default_enabled: true +default_enabled: false diff --git a/config/feature_flags/development/ci_skip_legacy_extra_minutes_recalculation.yml b/config/feature_flags/development/ci_job_artifacts_backlog_large_loop_limit.yml index 2b10b124c54..1415d9e0db7 100644 --- a/config/feature_flags/development/ci_skip_legacy_extra_minutes_recalculation.yml +++ b/config/feature_flags/development/ci_job_artifacts_backlog_large_loop_limit.yml @@ -1,8 +1,8 @@ --- -name: ci_skip_legacy_extra_minutes_recalculation -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78476 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341730 -milestone: '14.8' +name: ci_job_artifacts_backlog_large_loop_limit +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 default_enabled: false diff --git a/config/feature_flags/development/ci_variables_builder_memoize_secret_variables.yml b/config/feature_flags/development/ci_job_artifacts_backlog_work.yml index a35b06f9907..a97982d2043 100644 --- a/config/feature_flags/development/ci_variables_builder_memoize_secret_variables.yml +++ b/config/feature_flags/development/ci_job_artifacts_backlog_work.yml @@ -1,8 +1,8 @@ --- -name: ci_variables_builder_memoize_secret_variables -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79850 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/351995 -milestone: '14.8' +name: ci_job_artifacts_backlog_work +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76509 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/347144 +milestone: '14.10' type: development group: group::pipeline execution default_enabled: false diff --git a/config/feature_flags/development/prevent_sensitive_fields_from_serializable_hash.yml b/config/feature_flags/development/ci_namespace_mirrors_consistency_check.yml index 7bcbe6b79c2..965fb904a15 100644 --- a/config/feature_flags/development/prevent_sensitive_fields_from_serializable_hash.yml +++ b/config/feature_flags/development/ci_namespace_mirrors_consistency_check.yml @@ -1,8 +1,8 @@ --- -name: prevent_sensitive_fields_from_serializable_hash -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81773 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353878 -milestone: '14.9' +name: ci_namespace_mirrors_consistency_check +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81836 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356577 +milestone: '14.10' type: development group: group::sharding default_enabled: false diff --git a/config/feature_flags/development/use_model_load_balancing.yml b/config/feature_flags/development/ci_owned_runners_unnest_index.yml index 630e34acff3..225ec3d5df4 100644 --- a/config/feature_flags/development/use_model_load_balancing.yml +++ b/config/feature_flags/development/ci_owned_runners_unnest_index.yml @@ -1,8 +1,8 @@ --- -name: use_model_load_balancing -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73631 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344797 -milestone: '14.5' +name: ci_owned_runners_unnest_index +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83843 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/357869 +milestone: '14.10' type: development group: group::sharding default_enabled: false diff --git a/config/feature_flags/development/ci_project_mirrors_consistency_check.yml b/config/feature_flags/development/ci_project_mirrors_consistency_check.yml new file mode 100644 index 00000000000..9ba2865216d --- /dev/null +++ b/config/feature_flags/development/ci_project_mirrors_consistency_check.yml @@ -0,0 +1,8 @@ +--- +name: ci_project_mirrors_consistency_check +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81836 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356583 +milestone: '14.10' +type: development +group: group::sharding +default_enabled: false diff --git a/config/feature_flags/development/bulk_expire_project_artifacts.yml b/config/feature_flags/development/ci_test_report_artifacts_expired.yml index 9f1949e3dd2..843aa42efdc 100644 --- a/config/feature_flags/development/bulk_expire_project_artifacts.yml +++ b/config/feature_flags/development/ci_test_report_artifacts_expired.yml @@ -1,8 +1,8 @@ --- -name: bulk_expire_project_artifacts -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75488 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/347405 -milestone: '14.6' +name: ci_test_report_artifacts_expired +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83113 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356773 +milestone: '14.10' type: development group: group::pipeline insights -default_enabled: true +default_enabled: false diff --git a/config/feature_flags/development/ci_throttle_pipelines_creation.yml b/config/feature_flags/development/ci_throttle_pipelines_creation.yml new file mode 100644 index 00000000000..162a69ade5d --- /dev/null +++ b/config/feature_flags/development/ci_throttle_pipelines_creation.yml @@ -0,0 +1,8 @@ +--- +name: ci_throttle_pipelines_creation +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83969 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/357520 +milestone: '14.10' +type: development +group: group::pipeline execution +default_enabled: false diff --git a/config/feature_flags/development/pipeline_schedules_with_tags.yml b/config/feature_flags/development/ci_throttle_pipelines_creation_dry_run.yml index 9eb7b60d300..5092767e089 100644 --- a/config/feature_flags/development/pipeline_schedules_with_tags.yml +++ b/config/feature_flags/development/ci_throttle_pipelines_creation_dry_run.yml @@ -1,8 +1,8 @@ --- -name: pipeline_schedules_with_tags -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81476 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/354421 -milestone: '14.9' +name: ci_throttle_pipelines_creation_dry_run +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83969 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/357524 +milestone: '14.10' type: development group: group::pipeline execution default_enabled: true diff --git a/config/feature_flags/development/ci_trigger_forward_variables.yml b/config/feature_flags/development/ci_trigger_forward_variables.yml index 34e418599b4..4767ca0cb75 100644 --- a/config/feature_flags/development/ci_trigger_forward_variables.yml +++ b/config/feature_flags/development/ci_trigger_forward_variables.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/355572 milestone: '14.9' type: development group: group::pipeline authoring -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/ci_variables_builder_config_variables.yml b/config/feature_flags/development/ci_variables_builder_config_variables.yml new file mode 100644 index 00000000000..eb74993f90f --- /dev/null +++ b/config/feature_flags/development/ci_variables_builder_config_variables.yml @@ -0,0 +1,8 @@ +--- +name: ci_variables_builder_config_variables +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79935 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/358791 +milestone: '14.10' +type: development +group: group::pipeline execution +default_enabled: false diff --git a/config/feature_flags/development/container_registry_migration_phase2_all_plans.yml b/config/feature_flags/development/container_registry_migration_phase2_all_plans.yml new file mode 100644 index 00000000000..6742a006519 --- /dev/null +++ b/config/feature_flags/development/container_registry_migration_phase2_all_plans.yml @@ -0,0 +1,8 @@ +--- +name: container_registry_migration_phase2_all_plans +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83135 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350543 +milestone: '14.10' +type: development +group: group::package +default_enabled: false diff --git a/config/feature_flags/development/geo_token_user_authentication.yml b/config/feature_flags/development/container_security_policy_selection.yml index aab95c93312..e2407195ffc 100644 --- a/config/feature_flags/development/geo_token_user_authentication.yml +++ b/config/feature_flags/development/container_security_policy_selection.yml @@ -1,8 +1,8 @@ --- -name: geo_token_user_authentication -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79431 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/351450 -milestone: '14.8' +name: container_security_policy_selection +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80272 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353071 +milestone: '14.10' type: development -group: group::geo +group: group::container security default_enabled: true diff --git a/config/feature_flags/development/jira_connect_installation_update.yml b/config/feature_flags/development/convert_diff_to_utf8_with_replacement_symbol.yml index a92a7dafc14..1d0f64d9ac2 100644 --- a/config/feature_flags/development/jira_connect_installation_update.yml +++ b/config/feature_flags/development/convert_diff_to_utf8_with_replacement_symbol.yml @@ -1,8 +1,8 @@ --- -name: jira_connect_installation_update -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83038 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356083 +name: convert_diff_to_utf8_with_replacement_symbol +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79996 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/354526 milestone: '14.9' type: development -group: group::integrations +group: group::code review default_enabled: false diff --git a/config/feature_flags/development/create_project_settings.yml b/config/feature_flags/development/create_project_settings.yml new file mode 100644 index 00000000000..8c536d1f3fa --- /dev/null +++ b/config/feature_flags/development/create_project_settings.yml @@ -0,0 +1,8 @@ +--- +name: create_project_settings +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84502 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/358136 +milestone: '14.10' +type: development +group: group::authentication and authorization +default_enabled: false diff --git a/config/feature_flags/development/group_ci_cd_analytics_page.yml b/config/feature_flags/development/deployment_approval_rules.yml index 1ee7bda169b..1658f9c4fe0 100644 --- a/config/feature_flags/development/group_ci_cd_analytics_page.yml +++ b/config/feature_flags/development/deployment_approval_rules.yml @@ -1,8 +1,8 @@ --- -name: group_ci_cd_analytics_page -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49608 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/292601 -milestone: '13.8' +name: deployment_approval_rules +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83495 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/354726 +milestone: '14.10' type: development group: group::release default_enabled: true diff --git a/config/feature_flags/development/new_dir_modal.yml b/config/feature_flags/development/distribute_github_parallel_import.yml index 12d007209b7..e7f9ac78afb 100644 --- a/config/feature_flags/development/new_dir_modal.yml +++ b/config/feature_flags/development/distribute_github_parallel_import.yml @@ -1,8 +1,8 @@ --- -name: new_dir_modal -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71154 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341675 -milestone: '14.4' +name: distribute_github_parallel_import +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83616 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356800 +milestone: '14.10' type: development group: group::source code -default_enabled: true +default_enabled: false diff --git a/config/feature_flags/development/enforce_security_report_validation.yml b/config/feature_flags/development/enforce_security_report_validation.yml new file mode 100644 index 00000000000..0478033c55b --- /dev/null +++ b/config/feature_flags/development/enforce_security_report_validation.yml @@ -0,0 +1,8 @@ +--- +name: enforce_security_report_validation +introduced_by_url: +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/351000 +milestone: '14.9' +type: development +group: group::threat insights +default_enabled: false diff --git a/config/feature_flags/development/enhanced_notify_css.yml b/config/feature_flags/development/enhanced_notify_css.yml index e47db3ba435..010b80caf5d 100644 --- a/config/feature_flags/development/enhanced_notify_css.yml +++ b/config/feature_flags/development/enhanced_notify_css.yml @@ -1,7 +1,7 @@ --- name: enhanced_notify_css introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78604 -rollout_issue_url: +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/355907 milestone: '14.8' type: development group: group::project management diff --git a/config/feature_flags/development/releases_index_apollo_client.yml b/config/feature_flags/development/env_last_deployment_by_finished_at.yml index 072d72af573..36163b167d0 100644 --- a/config/feature_flags/development/releases_index_apollo_client.yml +++ b/config/feature_flags/development/env_last_deployment_by_finished_at.yml @@ -1,8 +1,8 @@ --- -name: releases_index_apollo_client -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61828 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/331006 -milestone: '14.0' +name: env_last_deployment_by_finished_at +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83558 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/357299 +milestone: '14.10' type: development group: group::release default_enabled: true diff --git a/config/feature_flags/development/environment_multiple_stop_actions.yml b/config/feature_flags/development/environment_multiple_stop_actions.yml new file mode 100644 index 00000000000..514d5e8cf52 --- /dev/null +++ b/config/feature_flags/development/environment_multiple_stop_actions.yml @@ -0,0 +1,8 @@ +--- +name: environment_multiple_stop_actions +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84922 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/358911 +milestone: '14.10' +type: development +group: group::release +default_enabled: false diff --git a/config/feature_flags/development/fix_related_environments_for_merge_requests.yml b/config/feature_flags/development/fix_related_environments_for_merge_requests.yml new file mode 100644 index 00000000000..d958f1d4de0 --- /dev/null +++ b/config/feature_flags/development/fix_related_environments_for_merge_requests.yml @@ -0,0 +1,8 @@ +--- +name: fix_related_environments_for_merge_requests +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83382 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356642 +milestone: '14.10' +type: development +group: group::release +default_enabled: true diff --git a/config/feature_flags/development/sbom_survey.yml b/config/feature_flags/development/geo_use_clone_on_first_sync.yml index aac523ee846..6eb41ee2f56 100644 --- a/config/feature_flags/development/sbom_survey.yml +++ b/config/feature_flags/development/geo_use_clone_on_first_sync.yml @@ -1,8 +1,8 @@ --- -name: sbom_survey -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76446 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/348181 -milestone: '14.6' +name: geo_use_clone_on_first_sync +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77143 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/357462 +milestone: '14.10' type: development -group: group::secure +group: group::geo default_enabled: false diff --git a/config/feature_flags/development/gitaly_backup.yml b/config/feature_flags/development/gitaly_backup.yml deleted file mode 100644 index 67552d39d92..00000000000 --- a/config/feature_flags/development/gitaly_backup.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: gitaly_backup -introduced_by_url: https://gitlab.com/gitlab-org/gitaly/-/merge_requests/3554 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/333034 -milestone: '14.0' -type: development -group: group::gitaly -default_enabled: true diff --git a/config/feature_flags/development/gitaly_replace_wiki_update_page.yml b/config/feature_flags/development/gitaly_replace_wiki_update_page.yml new file mode 100644 index 00000000000..9fabf5edde8 --- /dev/null +++ b/config/feature_flags/development/gitaly_replace_wiki_update_page.yml @@ -0,0 +1,8 @@ +--- +name: gitaly_replace_wiki_update_page +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83833 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/357246 +milestone: '14.10' +type: development +group: group::editor +default_enabled: false diff --git a/config/feature_flags/development/group_member_inherited_group.yml b/config/feature_flags/development/group_member_inherited_group.yml new file mode 100644 index 00000000000..6b10f8fa715 --- /dev/null +++ b/config/feature_flags/development/group_member_inherited_group.yml @@ -0,0 +1,8 @@ +--- +name: group_member_inherited_group +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71465 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/357244 +milestone: '14.10' +type: development +group: group::workspace +default_enabled: false diff --git a/config/feature_flags/development/group_projects_api_preload_groups.yml b/config/feature_flags/development/group_projects_api_preload_groups.yml new file mode 100644 index 00000000000..dea472548ae --- /dev/null +++ b/config/feature_flags/development/group_projects_api_preload_groups.yml @@ -0,0 +1,8 @@ +--- +name: group_projects_api_preload_groups +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81838 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/354372 +milestone: '14.9' +type: development +group: group::authentication and authorization +default_enabled: false diff --git a/config/feature_flags/development/group_wiki_settings_toggle.yml b/config/feature_flags/development/group_wiki_settings_toggle.yml new file mode 100644 index 00000000000..083453a6944 --- /dev/null +++ b/config/feature_flags/development/group_wiki_settings_toggle.yml @@ -0,0 +1,8 @@ +--- +name: group_wiki_settings_toggle +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82298 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/358387 +milestone: '14.10' +type: development +group: group::editor +default_enabled: false diff --git a/config/feature_flags/development/header_read_timeout_buffered_io.yml b/config/feature_flags/development/header_read_timeout_buffered_io.yml deleted file mode 100644 index ba7ef4cc000..00000000000 --- a/config/feature_flags/development/header_read_timeout_buffered_io.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: header_read_timeout_buffered_io -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78065 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350233 -milestone: '14.8' -type: development -group: group::integrations -default_enabled: true diff --git a/config/feature_flags/development/import_project_from_remote_file.yml b/config/feature_flags/development/import_project_from_remote_file.yml deleted file mode 100644 index 09f40a92ad1..00000000000 --- a/config/feature_flags/development/import_project_from_remote_file.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: import_project_from_remote_file -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59033 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330039 -milestone: '13.12' -type: development -group: group::import -default_enabled: true diff --git a/config/feature_flags/development/incident_escalations.yml b/config/feature_flags/development/incident_escalations.yml index 3853a8be2de..61ae0092dc9 100644 --- a/config/feature_flags/development/incident_escalations.yml +++ b/config/feature_flags/development/incident_escalations.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345769 milestone: '14.6' type: development group: group::respond -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/incident_timeline_event_tab.yml b/config/feature_flags/development/incident_timeline.yml index 01dd9276007..09a08b9fcb6 100644 --- a/config/feature_flags/development/incident_timeline_event_tab.yml +++ b/config/feature_flags/development/incident_timeline.yml @@ -1,5 +1,5 @@ --- -name: incident_timeline_event_tab +name: incident_timeline introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80802 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353426 milestone: '14.9' diff --git a/config/feature_flags/development/incremental_repository_backup.yml b/config/feature_flags/development/incremental_repository_backup.yml index d9eb97ba327..2b980abd403 100644 --- a/config/feature_flags/development/incremental_repository_backup.yml +++ b/config/feature_flags/development/incremental_repository_backup.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/355945 milestone: '14.9' type: development group: group::gitaly -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/integration_form_sections.yml b/config/feature_flags/development/integration_form_sections.yml deleted file mode 100644 index bb03174d2fd..00000000000 --- a/config/feature_flags/development/integration_form_sections.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: integration_form_sections -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80712 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/352827 -milestone: '14.9' -type: development -group: group::integrations -default_enabled: true diff --git a/config/feature_flags/development/group_import_export.yml b/config/feature_flags/development/ipynb_semantic_diff.yml index 0eb01340bef..ef16cacaa37 100644 --- a/config/feature_flags/development/group_import_export.yml +++ b/config/feature_flags/development/ipynb_semantic_diff.yml @@ -1,8 +1,8 @@ --- -name: group_import_export -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/22423 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/282245 -milestone: '12.8' +name: ipynb_semantic_diff +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85079 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/358917 +milestone: '15.0' type: development -group: group::import +group: group::code review default_enabled: true diff --git a/config/feature_flags/development/ci_destroy_all_expired_service.yml b/config/feature_flags/development/jobs_table_vue_search.yml index 0f36a8d7e30..ad0c25eccce 100644 --- a/config/feature_flags/development/ci_destroy_all_expired_service.yml +++ b/config/feature_flags/development/jobs_table_vue_search.yml @@ -1,8 +1,8 @@ --- -name: ci_destroy_all_expired_service -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76504 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/348786 -milestone: '14.6' +name: jobs_table_vue_search +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82539 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356007 +milestone: '14.10' type: development group: group::pipeline execution -default_enabled: true +default_enabled: false diff --git a/config/feature_flags/development/merge_service_ping_instrumented_metrics.yml b/config/feature_flags/development/merge_service_ping_instrumented_metrics.yml deleted file mode 100644 index 4a19544bb9f..00000000000 --- a/config/feature_flags/development/merge_service_ping_instrumented_metrics.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: merge_service_ping_instrumented_metrics -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77629 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/352964 -milestone: '14.8' -type: development -group: group::product intelligence -default_enabled: true diff --git a/config/feature_flags/development/new_header_search.yml b/config/feature_flags/development/new_header_search.yml index 086aee4c4b0..58bd1781dae 100644 --- a/config/feature_flags/development/new_header_search.yml +++ b/config/feature_flags/development/new_header_search.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339348 milestone: '14.3' type: development group: group::global search -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/new_vulnerability_form.yml b/config/feature_flags/development/new_vulnerability_form.yml index ee812484928..8f73b18876c 100644 --- a/config/feature_flags/development/new_vulnerability_form.yml +++ b/config/feature_flags/development/new_vulnerability_form.yml @@ -5,4 +5,4 @@ rollout_issue_url: milestone: '14.9' type: development group: group::threat insights -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/improved_emoji_picker.yml b/config/feature_flags/development/nullify_in_batches_on_user_deletion.yml index c014328fad1..d97b4974f27 100644 --- a/config/feature_flags/development/improved_emoji_picker.yml +++ b/config/feature_flags/development/nullify_in_batches_on_user_deletion.yml @@ -1,8 +1,8 @@ --- -name: improved_emoji_picker -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54469 +name: 'nullify_in_batches_on_user_deletion' +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84709 rollout_issue_url: -milestone: '13.9' +milestone: '14.10' type: development -group: group::code review +group: group::optimize default_enabled: true diff --git a/config/feature_flags/development/omniauth_initializer_fullhost_proc.yml b/config/feature_flags/development/omniauth_initializer_fullhost_proc.yml new file mode 100644 index 00000000000..75ed8e642c6 --- /dev/null +++ b/config/feature_flags/development/omniauth_initializer_fullhost_proc.yml @@ -0,0 +1,8 @@ +--- +name: omniauth_initializer_fullhost_proc +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82401 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/355579 +milestone: '14.10' +type: development +group: group::geo +default_enabled: false diff --git a/config/feature_flags/development/optimized_followed_users_queries.yml b/config/feature_flags/development/optimized_followed_users_queries.yml new file mode 100644 index 00000000000..514c3c91829 --- /dev/null +++ b/config/feature_flags/development/optimized_followed_users_queries.yml @@ -0,0 +1,8 @@ +--- +name: optimized_followed_users_queries +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84856 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/358649 +milestone: '14.10' +type: development +group: group::optimize +default_enabled: false diff --git a/config/feature_flags/development/ci_fix_order_of_subsequent_jobs.yml b/config/feature_flags/development/pipeline_tabs_vue.yml index 9a98604d0a8..848166d2cc1 100644 --- a/config/feature_flags/development/ci_fix_order_of_subsequent_jobs.yml +++ b/config/feature_flags/development/pipeline_tabs_vue.yml @@ -1,8 +1,8 @@ --- -name: ci_fix_order_of_subsequent_jobs -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74394 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345587 -milestone: '14.9' +name: pipeline_tabs_vue +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80401 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353118 +milestone: '14.10' type: development group: group::pipeline authoring default_enabled: false diff --git a/config/feature_flags/development/iteration_cadences.yml b/config/feature_flags/development/realtime_labels.yml index c90743020d6..6072a4b044a 100644 --- a/config/feature_flags/development/iteration_cadences.yml +++ b/config/feature_flags/development/realtime_labels.yml @@ -1,8 +1,8 @@ --- -name: iteration_cadences -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54822 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/354878 -milestone: '13.10' +name: realtime_labels +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83743 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/357370 +milestone: '14.10' type: development group: group::project management default_enabled: false diff --git a/config/feature_flags/development/record_projects_target_platforms.yml b/config/feature_flags/development/record_projects_target_platforms.yml new file mode 100644 index 00000000000..6faeab3afe4 --- /dev/null +++ b/config/feature_flags/development/record_projects_target_platforms.yml @@ -0,0 +1,8 @@ +--- +name: record_projects_target_platforms +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80361 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/354286 +milestone: '14.10' +type: development +group: group::activation +default_enabled: false diff --git a/config/feature_flags/development/refactor_blob_viewer.yml b/config/feature_flags/development/refactor_blob_viewer.yml index 231e2684023..2c418e87a49 100644 --- a/config/feature_flags/development/refactor_blob_viewer.yml +++ b/config/feature_flags/development/refactor_blob_viewer.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/324351 milestone: '13.11' type: development group: group::source code -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/remove_import_data_on_failure.yml b/config/feature_flags/development/remove_import_data_on_failure.yml deleted file mode 100644 index 341e027f28b..00000000000 --- a/config/feature_flags/development/remove_import_data_on_failure.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: remove_import_data_on_failure -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80074 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/352156 -milestone: '14.8' -type: development -group: group::source code -default_enabled: true diff --git a/config/feature_flags/development/runner_list_group_view_vue_ui.yml b/config/feature_flags/development/runner_list_group_view_vue_ui.yml index 3bda540ba5b..542bad1b236 100644 --- a/config/feature_flags/development/runner_list_group_view_vue_ui.yml +++ b/config/feature_flags/development/runner_list_group_view_vue_ui.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/336405 milestone: '14.2' type: development group: group::runner -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/show_minute_limit_banner.yml b/config/feature_flags/development/show_minute_limit_banner.yml new file mode 100644 index 00000000000..ecf9d98bea2 --- /dev/null +++ b/config/feature_flags/development/show_minute_limit_banner.yml @@ -0,0 +1,8 @@ +--- +name: show_minute_limit_banner +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84644 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/358191 +milestone: '14.10' +type: development +group: group::workspace +default_enabled: false diff --git a/config/feature_flags/development/show_report_validation_warnings.yml b/config/feature_flags/development/show_report_validation_warnings.yml deleted file mode 100644 index 551d432a928..00000000000 --- a/config/feature_flags/development/show_report_validation_warnings.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: show_report_validation_warnings -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80930 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353125 -milestone: '14.9' -type: development -group: group::threat insights -default_enabled: true diff --git a/config/feature_flags/development/spread_parallel_import.yml b/config/feature_flags/development/spread_parallel_import.yml deleted file mode 100644 index 1e75502e032..00000000000 --- a/config/feature_flags/development/spread_parallel_import.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: spread_parallel_import -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81026 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353217 -milestone: '14.9' -type: development -group: group::source code -default_enabled: true diff --git a/config/feature_flags/development/track_editor_edit_actions.yml b/config/feature_flags/development/track_editor_edit_actions.yml deleted file mode 100644 index d73307231a2..00000000000 --- a/config/feature_flags/development/track_editor_edit_actions.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: track_editor_edit_actions -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39694 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/240928 -milestone: '13.4' -type: development -group: group::editor -default_enabled: true diff --git a/config/feature_flags/development/mrc_api_use_raw_diffs_from_gitaly.yml b/config/feature_flags/development/uncached_mr_attention_requests_count.yml index a75824d3c24..239490ab1c2 100644 --- a/config/feature_flags/development/mrc_api_use_raw_diffs_from_gitaly.yml +++ b/config/feature_flags/development/uncached_mr_attention_requests_count.yml @@ -1,8 +1,8 @@ --- -name: mrc_api_use_raw_diffs_from_gitaly -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46190 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/225322 +name: uncached_mr_attention_requests_count +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84145 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/357480 +milestone: '14.10' type: development group: group::code review default_enabled: false -milestone: '13.6' diff --git a/config/feature_flags/development/usage_data_diff_searches.yml b/config/feature_flags/development/usage_data_diff_searches.yml deleted file mode 100644 index 1fa0d2b934c..00000000000 --- a/config/feature_flags/development/usage_data_diff_searches.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: usage_data_diff_searches -introduced_by_url: -rollout_issue_url: -milestone: '14.2' -type: development -group: group::code review -default_enabled: true diff --git a/config/feature_flags/development/users_expanding_widgets_usage_data.yml b/config/feature_flags/development/usage_data_i_code_review_user_gitlab_cli_api_request.yml index 3b68aff5d71..898c19a34a9 100644 --- a/config/feature_flags/development/users_expanding_widgets_usage_data.yml +++ b/config/feature_flags/development/usage_data_i_code_review_user_gitlab_cli_api_request.yml @@ -1,8 +1,8 @@ --- -name: users_expanding_widgets_usage_data -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57133 +name: usage_data_i_code_review_user_gitlab_cli_api_request +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83464 rollout_issue_url: -milestone: '13.11' +milestone: '14.10' type: development group: group::code review default_enabled: true diff --git a/config/feature_flags/development/use_api_for_payment_validation.yml b/config/feature_flags/development/use_api_for_payment_validation.yml new file mode 100644 index 00000000000..f57df08a2b0 --- /dev/null +++ b/config/feature_flags/development/use_api_for_payment_validation.yml @@ -0,0 +1,8 @@ +--- +name: use_api_for_payment_validation +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84292 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/357282 +milestone: '14.10' +type: development +group: group::purchase +default_enabled: false diff --git a/config/feature_flags/development/user_other_role_details.yml b/config/feature_flags/development/user_other_role_details.yml index 47666a1d5c5..7c0b417d398 100644 --- a/config/feature_flags/development/user_other_role_details.yml +++ b/config/feature_flags/development/user_other_role_details.yml @@ -1,7 +1,7 @@ --- name: user_other_role_details introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45635 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/255170 +rollout_issue_url: https://gitlab.com/gitlab-org/growth/team-tasks/-/issues/282 milestone: '13.7' type: development group: group::conversion diff --git a/config/feature_flags/development/verify_protected_tags_for_pull_mirror.yml b/config/feature_flags/development/verify_protected_tags_for_pull_mirror.yml deleted file mode 100644 index 44da565181f..00000000000 --- a/config/feature_flags/development/verify_protected_tags_for_pull_mirror.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: verify_protected_tags_for_pull_mirror -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80388 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/352494 -milestone: '14.9' -type: development -group: group::source code -default_enabled: true diff --git a/config/feature_flags/development/vsa_consistency_worker.yml b/config/feature_flags/development/vsa_consistency_worker.yml index d880f38af69..c038efeb9cd 100644 --- a/config/feature_flags/development/vsa_consistency_worker.yml +++ b/config/feature_flags/development/vsa_consistency_worker.yml @@ -1,8 +1,8 @@ --- name: vsa_consistency_worker -introduced_by_url: +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82591 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/355709 milestone: '14.9' type: development group: group::optimize -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/vsa_reaggregation_worker.yml b/config/feature_flags/development/vsa_reaggregation_worker.yml new file mode 100644 index 00000000000..d5218d6e7e3 --- /dev/null +++ b/config/feature_flags/development/vsa_reaggregation_worker.yml @@ -0,0 +1,8 @@ +--- +name: vsa_reaggregation_worker +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84171 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/357647 +milestone: '14.10' +type: development +group: group::optimize +default_enabled: false diff --git a/config/feature_flags/development/vue_issues_list.yml b/config/feature_flags/development/vue_issues_list.yml index bc5537c1f40..b85c75105f7 100644 --- a/config/feature_flags/development/vue_issues_list.yml +++ b/config/feature_flags/development/vue_issues_list.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/323743 milestone: '13.10' type: development group: group::project management -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/vulnerability_reads_table.yml b/config/feature_flags/development/vulnerability_reads_table.yml index 68e6ffead14..0269c5330ae 100644 --- a/config/feature_flags/development/vulnerability_reads_table.yml +++ b/config/feature_flags/development/vulnerability_reads_table.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/348151 milestone: '14.9' type: development group: group::threat insights -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/vulnerability_report_pagination.yml b/config/feature_flags/development/vulnerability_report_pagination.yml index 71639f6790b..677cc1efe11 100644 --- a/config/feature_flags/development/vulnerability_report_pagination.yml +++ b/config/feature_flags/development/vulnerability_report_pagination.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/351975 milestone: '14.8' type: development group: group::threat insights -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/wiki_switch_between_content_editor_raw_markdown.yml b/config/feature_flags/development/wiki_switch_between_content_editor_raw_markdown.yml deleted file mode 100644 index dbdf2d616d2..00000000000 --- a/config/feature_flags/development/wiki_switch_between_content_editor_raw_markdown.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: wiki_switch_between_content_editor_raw_markdown -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74457 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345398 -milestone: '14.6' -type: development -group: group::editor -default_enabled: true diff --git a/config/feature_flags/experiment/invite_team_email.yml b/config/feature_flags/experiment/ios_specific_templates.yml index f430b6ff88b..0af80e7a5bb 100644 --- a/config/feature_flags/experiment/invite_team_email.yml +++ b/config/feature_flags/experiment/ios_specific_templates.yml @@ -1,8 +1,8 @@ --- -name: invite_team_email -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72470 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345553 -milestone: '14.5' +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/experiment/pql_three_cta_test.yml b/config/feature_flags/experiment/pql_three_cta_test.yml index 33ffcadb5c0..f65d3080c05 100644 --- a/config/feature_flags/experiment/pql_three_cta_test.yml +++ b/config/feature_flags/experiment/pql_three_cta_test.yml @@ -1,7 +1,7 @@ --- name: pql_three_cta_test introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74054 -rollout_issue_url: +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/349799 milestone: '14.7' type: experiment group: group::conversion diff --git a/config/feature_flags/experiment/new_project_sast_enabled.yml b/config/feature_flags/experiment/video_tutorials_continuous_onboarding.yml index f47c01d26aa..6dc3f798f63 100644 --- a/config/feature_flags/experiment/new_project_sast_enabled.yml +++ b/config/feature_flags/experiment/video_tutorials_continuous_onboarding.yml @@ -1,8 +1,8 @@ --- -name: new_project_sast_enabled -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70548 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340929 -milestone: '14.4' +name: video_tutorials_continuous_onboarding +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82274 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/351916 +milestone: '14.9' type: experiment group: group::adoption default_enabled: false diff --git a/config/feature_flags/ops/api_kaminari_count_with_limit.yml b/config/feature_flags/ops/api_kaminari_count_with_limit.yml deleted file mode 100644 index c11c6758189..00000000000 --- a/config/feature_flags/ops/api_kaminari_count_with_limit.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: api_kaminari_count_with_limit -introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/23931 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353077 -milestone: '11.8' -type: ops -group: group::integrations -default_enabled: true diff --git a/config/feature_flags/ops/ci_secure_files_read_only.yml b/config/feature_flags/ops/ci_secure_files_read_only.yml new file mode 100644 index 00000000000..b0921be030c --- /dev/null +++ b/config/feature_flags/ops/ci_secure_files_read_only.yml @@ -0,0 +1,8 @@ +--- +name: ci_secure_files_read_only +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84089 +rollout_issue_url: +milestone: '14.10' +type: ops +group: group::incubation +default_enabled: false
\ No newline at end of file diff --git a/config/feature_flags/ops/execute_batched_migrations_on_schedule_ci_database.yml b/config/feature_flags/ops/execute_batched_migrations_on_schedule_ci_database.yml new file mode 100644 index 00000000000..9efbbd014a1 --- /dev/null +++ b/config/feature_flags/ops/execute_batched_migrations_on_schedule_ci_database.yml @@ -0,0 +1,8 @@ +--- +name: execute_batched_migrations_on_schedule_ci_database +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83109 +rollout_issue_url: +milestone: '14.9' +type: ops +group: group::database +default_enabled: false diff --git a/config/feature_flags/development/diff_settings_usage_data.yml b/config/feature_flags/ops/global_search_users_tab.yml index 62f3a39584e..57a07aa9e39 100644 --- a/config/feature_flags/development/diff_settings_usage_data.yml +++ b/config/feature_flags/ops/global_search_users_tab.yml @@ -1,8 +1,8 @@ --- -name: diff_settings_usage_data -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979 +name: global_search_users_tab +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84186 rollout_issue_url: -milestone: '13.11' -type: development -group: group::code review +milestone: '14.10' +type: ops +group: group::global search default_enabled: true diff --git a/config/feature_flags/ops/purge_stale_security_findings.yml b/config/feature_flags/ops/purge_stale_security_findings.yml index 322f31b62ce..0c011a1ddae 100644 --- a/config/feature_flags/ops/purge_stale_security_findings.yml +++ b/config/feature_flags/ops/purge_stale_security_findings.yml @@ -1,7 +1,7 @@ --- name: purge_stale_security_findings introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81423 -rollout_issue_url: +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356464 milestone: '14.9' type: ops group: group::threat insights diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 88af8cc12aa..57106120fb2 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -1035,6 +1035,9 @@ production: &base # arguments, followed by optional 'args' which can be either a hash or an array. # Documentation for this is available at http://doc.gitlab.com/ce/integration/omniauth.html providers: + # - { name: 'alicloud', + # app_id: 'YOUR_APP_ID', + # app_secret: 'YOUR_APP_SECRET' } # See omniauth-cas3 for more configuration details # - { name: 'cas3', # label: 'cas3', @@ -1179,7 +1182,7 @@ production: &base ## Backup settings backup: path: "tmp/backups" # Relative paths are relative to Rails.root (default: tmp/backups/) - # gitaly_backup_path: # Path of the gitaly-backup binary (default: searches $PATH) + # gitaly_backup_path: /home/git/gitaly/_build/bin/gitaly-backup # Path of the gitaly-backup binary (default: searches $PATH) # archive_permissions: 0640 # Permissions for the resulting backup.tar file (default: 0600) # keep_time: 604800 # default: 0 (forever) (in seconds) # pg_schema: public # default: nil, it means that all schemas will be backed up @@ -1562,6 +1565,9 @@ test: external_providers: [] providers: + - { name: 'alicloud', + app_id: 'YOUR_APP_ID', + app_secret: 'YOUR_APP_SECRET' } - { name: 'cas3', label: 'cas3', args: { url: 'https://sso.example.com', diff --git a/config/gitlab_loose_foreign_keys.yml b/config/gitlab_loose_foreign_keys.yml index 7f9539c3604..8f228120c8e 100644 --- a/config/gitlab_loose_foreign_keys.yml +++ b/config/gitlab_loose_foreign_keys.yml @@ -11,6 +11,9 @@ ci_builds: - table: projects column: project_id on_delete: async_delete + - table: ci_runners + column: runner_id + on_delete: async_nullify ci_builds_metadata: - table: projects column: project_id @@ -204,10 +207,6 @@ pages_deployments: - table: ci_builds column: ci_build_id on_delete: async_nullify -project_pages_metadata: - - table: ci_job_artifacts - column: artifacts_archive_id - on_delete: async_nullify requirements_management_test_reports: - table: ci_builds column: build_id diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 25d142566f0..c0dc18c60c9 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -446,6 +446,9 @@ Settings.cron_jobs['pipeline_schedule_worker']['job_class'] = 'PipelineScheduleW Settings.cron_jobs['expire_build_artifacts_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['expire_build_artifacts_worker']['cron'] ||= '*/7 * * * *' Settings.cron_jobs['expire_build_artifacts_worker']['job_class'] = 'ExpireBuildArtifactsWorker' +Settings.cron_jobs['update_locked_unknown_artifacts_worker'] ||= Settingslogic.new({}) +Settings.cron_jobs['update_locked_unknown_artifacts_worker']['cron'] ||= '*/7 * * * *' +Settings.cron_jobs['update_locked_unknown_artifacts_worker']['job_class'] = 'Ci::UpdateLockedUnknownArtifactsWorker' Settings.cron_jobs['ci_pipelines_expire_artifacts_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['ci_pipelines_expire_artifacts_worker']['cron'] ||= '*/23 * * * *' Settings.cron_jobs['ci_pipelines_expire_artifacts_worker']['job_class'] = 'Ci::PipelineArtifacts::ExpireArtifactsWorker' @@ -500,6 +503,9 @@ Settings.cron_jobs['trending_projects_worker']['job_class'] = 'TrendingProjectsW Settings.cron_jobs['remove_unreferenced_lfs_objects_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['remove_unreferenced_lfs_objects_worker']['cron'] ||= '20 0 * * *' Settings.cron_jobs['remove_unreferenced_lfs_objects_worker']['job_class'] = 'RemoveUnreferencedLfsObjectsWorker' +Settings.cron_jobs['bulk_imports_stuck_import_worker'] ||= Settingslogic.new({}) +Settings.cron_jobs['bulk_imports_stuck_import_worker']['cron'] ||= '0 */4 * * *' +Settings.cron_jobs['bulk_imports_stuck_import_worker']['job_class'] = 'BulkImports::StuckImportWorker' Settings.cron_jobs['import_stuck_project_import_jobs'] ||= Settingslogic.new({}) Settings.cron_jobs['import_stuck_project_import_jobs']['cron'] ||= '15 * * * *' Settings.cron_jobs['import_stuck_project_import_jobs']['job_class'] = 'Gitlab::Import::StuckProjectImportJobsWorker' @@ -634,6 +640,9 @@ Gitlab.ee do Settings.cron_jobs['analytics_cycle_analytics_consistency_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['analytics_cycle_analytics_consistency_worker']['cron'] ||= '*/30 * * * *' Settings.cron_jobs['analytics_cycle_analytics_consistency_worker']['job_class'] = 'Analytics::CycleAnalytics::ConsistencyWorker' + Settings.cron_jobs['analytics_cycle_analytics_reaggregation_worker'] ||= Settingslogic.new({}) + Settings.cron_jobs['analytics_cycle_analytics_reaggregation_worker']['cron'] ||= '44 * * * *' + Settings.cron_jobs['analytics_cycle_analytics_reaggregation_worker']['job_class'] = 'Analytics::CycleAnalytics::ReaggregationWorker' Settings.cron_jobs['active_user_count_threshold_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['active_user_count_threshold_worker']['cron'] ||= '0 12 * * *' Settings.cron_jobs['active_user_count_threshold_worker']['job_class'] = 'ActiveUserCountThresholdWorker' @@ -760,6 +769,12 @@ Gitlab.ee do Settings.cron_jobs['loose_foreign_keys_cleanup_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['loose_foreign_keys_cleanup_worker']['cron'] ||= '*/1 * * * *' Settings.cron_jobs['loose_foreign_keys_cleanup_worker']['job_class'] = 'LooseForeignKeys::CleanupWorker' + Settings.cron_jobs['ci_namespace_mirrors_consistency_check_worker'] ||= Settingslogic.new({}) + Settings.cron_jobs['ci_namespace_mirrors_consistency_check_worker']['cron'] ||= '*/4 * * * *' + Settings.cron_jobs['ci_namespace_mirrors_consistency_check_worker']['job_class'] = 'Database::CiNamespaceMirrorsConsistencyCheckWorker' + Settings.cron_jobs['ci_project_mirrors_consistency_check_worker'] ||= Settingslogic.new({}) + Settings.cron_jobs['ci_project_mirrors_consistency_check_worker']['cron'] ||= '2-58/4 * * * *' + Settings.cron_jobs['ci_project_mirrors_consistency_check_worker']['job_class'] = 'Database::CiProjectMirrorsConsistencyCheckWorker' end # diff --git a/config/initializers/7_prometheus_metrics.rb b/config/initializers/7_prometheus_metrics.rb index e4d47d53815..6953de670a7 100644 --- a/config/initializers/7_prometheus_metrics.rb +++ b/config/initializers/7_prometheus_metrics.rb @@ -1,10 +1,9 @@ # frozen_string_literal: true -PUMA_EXTERNAL_METRICS_SERVER = Gitlab::Utils.to_boolean(ENV['PUMA_EXTERNAL_METRICS_SERVER']) -require Rails.root.join('metrics_server', 'metrics_server') if PUMA_EXTERNAL_METRICS_SERVER +require Rails.root.join('metrics_server', 'metrics_server') # Keep separate directories for separate processes -def prometheus_default_multiproc_dir +def metrics_temp_dir return unless Rails.env.development? || Rails.env.test? if Gitlab::Runtime.sidekiq? @@ -16,20 +15,28 @@ def prometheus_default_multiproc_dir end end -def puma_metrics_server_process? +def prometheus_metrics_dir + ENV['prometheus_multiproc_dir'] || metrics_temp_dir +end + +def puma_master? Prometheus::PidProvider.worker_id == 'puma_master' end -def sidekiq_metrics_server_process? - Gitlab::Runtime.sidekiq? && (!ENV['SIDEKIQ_WORKER_ID'] || ENV['SIDEKIQ_WORKER_ID'] == '0') +# Whether a dedicated process should run that serves Rails application metrics, as opposed +# to using a Rails controller. +def puma_dedicated_metrics_server? + Settings.monitoring.web_exporter.enabled end -if puma_metrics_server_process? || sidekiq_metrics_server_process? +if puma_master? # The following is necessary to ensure stale Prometheus metrics don't accumulate over time. - # It needs to be done as early as here to ensure metrics files aren't deleted. - # After we hit our app in `warmup`, first metrics and corresponding files already being created, - # for example in `lib/gitlab/metrics/requests_rack_middleware.rb`. - Prometheus::CleanupMultiprocDirService.new.execute + # It needs to be done as early as possible to ensure new metrics aren't being deleted. + # + # Note that this should not happen for Sidekiq. Since Sidekiq workers are spawned from the + # sidekiq-cluster script, we perform this cleanup in `sidekiq_cluster/cli.rb` instead, + # since it must happen prior to any worker processes or the metrics server starting up. + Prometheus::CleanupMultiprocDirService.new(prometheus_metrics_dir).execute ::Prometheus::Client.reinitialize_on_pid_change(force: true) end @@ -37,7 +44,7 @@ end ::Prometheus::Client.configure do |config| config.logger = Gitlab::AppLogger - config.multiprocess_files_dir = ENV['prometheus_multiproc_dir'] || prometheus_default_multiproc_dir + config.multiprocess_files_dir = prometheus_metrics_dir config.pid_provider = ::Prometheus::PidProvider.method(:worker_id) end @@ -75,11 +82,7 @@ Gitlab::Cluster::LifecycleEvents.on_master_start do if Gitlab::Runtime.puma? Gitlab::Metrics::Samplers::PumaSampler.instance.start - if PUMA_EXTERNAL_METRICS_SERVER && Settings.monitoring.web_exporter.enabled - MetricsServer.start_for_puma - else - Gitlab::Metrics::Exporter::WebExporter.instance.start - end + MetricsServer.start_for_puma if puma_dedicated_metrics_server? end Gitlab::Ci::Parsers.instrument! @@ -98,11 +101,7 @@ Gitlab::Cluster::LifecycleEvents.on_worker_start do if Gitlab::Runtime.puma? # Since we are observing a metrics server from the Puma primary, we would inherit # this supervision thread after forking into workers, so we need to explicitly stop it here. - if PUMA_EXTERNAL_METRICS_SERVER - ::MetricsServer::PumaProcessSupervisor.instance.stop - else - Gitlab::Metrics::Exporter::WebExporter.instance.stop - end + ::MetricsServer::PumaProcessSupervisor.instance.stop if puma_dedicated_metrics_server? Gitlab::Metrics::Samplers::ActionCableSampler.instance(logger: logger).start end @@ -117,15 +116,11 @@ rescue IOError => e Gitlab::Metrics.error_detected! end -if Gitlab::Runtime.puma? +if Gitlab::Runtime.puma? && puma_dedicated_metrics_server? Gitlab::Cluster::LifecycleEvents.on_before_graceful_shutdown do # We need to ensure that before we re-exec or shutdown server # we also stop the metrics server - if PUMA_EXTERNAL_METRICS_SERVER - ::MetricsServer::PumaProcessSupervisor.instance.shutdown - else - Gitlab::Metrics::Exporter::WebExporter.instance.stop - end + ::MetricsServer::PumaProcessSupervisor.instance.shutdown end Gitlab::Cluster::LifecycleEvents.on_before_master_restart do @@ -134,10 +129,6 @@ if Gitlab::Runtime.puma? # # We do it again, for being extra safe, # but it should not be needed - if PUMA_EXTERNAL_METRICS_SERVER - ::MetricsServer::PumaProcessSupervisor.instance.shutdown - else - Gitlab::Metrics::Exporter::WebExporter.instance.stop - end + ::MetricsServer::PumaProcessSupervisor.instance.shutdown end end diff --git a/config/initializers/gitlab_experiment.rb b/config/initializers/gitlab_experiment.rb index 9a6ef325c9e..a201a075f62 100644 --- a/config/initializers/gitlab_experiment.rb +++ b/config/initializers/gitlab_experiment.rb @@ -13,7 +13,7 @@ Gitlab::Experiment.configure do |config| # Customize the logic of our default rollout, which shouldn't include # assigning the control yet -- we specifically set it to false for now. # - config.default_rollout = Gitlab::Experiment::Rollout::Feature.new + config.default_rollout = Gitlab::Experiment::Rollout.resolve(:feature) # Mount the engine and middleware at a gitlab friendly style path. # diff --git a/config/initializers/graphql.rb b/config/initializers/graphql.rb deleted file mode 100644 index 52c26e756a5..00000000000 --- a/config/initializers/graphql.rb +++ /dev/null @@ -1,5 +0,0 @@ -# frozen_string_literal: true - -GraphQL::ObjectType.accepts_definitions(authorize: GraphQL::Define.assign_metadata_key(:authorize)) - -GraphQL::Schema::Object.accepts_definition(:authorize) diff --git a/config/initializers/load_balancing.rb b/config/initializers/load_balancing.rb index df75178740b..290481f7296 100644 --- a/config/initializers/load_balancing.rb +++ b/config/initializers/load_balancing.rb @@ -2,6 +2,15 @@ Gitlab::Application.configure do |config| config.middleware.use(Gitlab::Database::LoadBalancing::RackMiddleware) + + # We need re-rerun the setup when code reloads in development + config.reloader.to_prepare do + if Rails.env.development? || Rails.env.test? + Gitlab::Database::LoadBalancing.base_models.each do |model| + Gitlab::Database::LoadBalancing::Setup.new(model).setup + end + end + end end Gitlab::Database::LoadBalancing.base_models.each do |model| @@ -14,6 +23,12 @@ Gitlab::Database::LoadBalancing.base_models.each do |model| # information. Gitlab::Database::LoadBalancing::Setup.new(model).setup + Rails.application.reloader.to_prepare do + if Rails.env.development? + Gitlab::Database::LoadBalancing::Setup.new(model).setup + end + end + # Database queries may be run before we fork, so we must set up the load # balancer as early as possible. When we do fork, we need to make sure all the # hosts are disconnected. diff --git a/config/initializers/multi_json.rb b/config/initializers/multi_json.rb index 93a81d8320d..5f98ce1961f 100644 --- a/config/initializers/multi_json.rb +++ b/config/initializers/multi_json.rb @@ -2,4 +2,4 @@ # Explicitly set the JSON adapter used by MultiJson # Currently we want this to default to the existing json gem -MultiJson.use(:json_gem) +MultiJson.use(:oj) diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index 478a5828809..24040d7b076 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -11,7 +11,15 @@ if Gitlab::Auth::Ldap::Config.enabled? end end -OmniAuth.config.full_host = Settings.gitlab['base_url'] +OmniAuth.config.full_host = + if Feature.feature_flags_available? && ::Feature.enabled?(:omniauth_initializer_fullhost_proc, default_enabled: :yaml) + Gitlab::AppLogger.debug("Using OmniAuth proc initializer") + Gitlab::OmniauthInitializer.full_host + else + Gitlab::AppLogger.debug("Fallback to OmniAuth static full_host") + Settings.gitlab['base_url'] + end + OmniAuth.config.allowed_request_methods = [:post] # In case of auto sign-in, the GET method is used (users don't get to click on a button) OmniAuth.config.allowed_request_methods << :get if Gitlab.config.omniauth.auto_sign_in_with_provider.present? diff --git a/config/initializers_before_autoloader/004_zeitwerk.rb b/config/initializers_before_autoloader/004_zeitwerk.rb index 60cc57c3282..ff96a84166a 100644 --- a/config/initializers_before_autoloader/004_zeitwerk.rb +++ b/config/initializers_before_autoloader/004_zeitwerk.rb @@ -25,6 +25,7 @@ Rails.autoloaders.each do |autoloader| 'cidr' => 'CIDR', 'cli' => 'CLI', 'dn' => 'DN', + 'gitlab_cli_activity_unique_counter' => 'GitLabCliActivityUniqueCounter', 'global_id_type' => 'GlobalIDType', 'global_id_compatibility' => 'GlobalIDCompatibility', 'hll' => 'HLL', diff --git a/config/metrics/aggregates/code_review.yml b/config/metrics/aggregates/code_review.yml index aee0e602e7b..004f155864e 100644 --- a/config/metrics/aggregates/code_review.yml +++ b/config/metrics/aggregates/code_review.yml @@ -74,6 +74,7 @@ - 'i_code_review_post_merge_submit_revert_modal' - 'i_code_review_post_merge_submit_cherry_pick_modal' - 'i_code_review_user_jetbrains_api_request' + - 'i_code_review_user_gitlab_cli_api_request' - name: code_review_category_monthly_active_users operator: OR source: redis @@ -146,3 +147,4 @@ events: - 'i_code_review_user_vs_code_api_request' - 'i_code_review_user_jetbrains_api_request' + - 'i_code_review_user_gitlab_cli_api_request' diff --git a/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml b/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml index 350363d79ce..016cbb23d49 100644 --- a/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml +++ b/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml @@ -1,7 +1,7 @@ --- data_category: optional key_path: redis_hll_counters.analytics.i_analytics_dev_ops_score_monthly -description: Unique visitors to /admin/dev_ops_report by month +description: Unique visitors to /admin/dev_ops_reports by month product_section: dev product_stage: manage product_group: group::optimize diff --git a/config/metrics/counts_28d/20210216175055_merge_requests.yml b/config/metrics/counts_28d/20210216175055_merge_requests.yml index 06c46964954..c57b9e281cf 100644 --- a/config/metrics/counts_28d/20210216175055_merge_requests.yml +++ b/config/metrics/counts_28d/20210216175055_merge_requests.yml @@ -7,7 +7,8 @@ product_stage: create product_group: group::code review product_category: code_review value_type: number -status: active +status: removed +milestone_removed: '14.10' time_frame: 28d data_source: database distribution: diff --git a/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml b/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml index fe7fcb65895..9c4356db883 100644 --- a/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml +++ b/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml @@ -1,7 +1,7 @@ --- data_category: optional key_path: usage_activity_by_stage_monthly.verify.ci_pipeline_config_auto_devops -description: Total pipelines from an Auto DevOps template +description: Distinct users that ran an auto DevOps pipeline without a .gitlab-ci.yml file. product_section: ops product_stage: configure product_group: group::configure diff --git a/config/metrics/counts_28d/20210216181057_projects_with_packages.yml b/config/metrics/counts_28d/20210216181057_projects_with_packages.yml index 3398dacaa92..17749102974 100644 --- a/config/metrics/counts_28d/20210216181057_projects_with_packages.yml +++ b/config/metrics/counts_28d/20210216181057_projects_with_packages.yml @@ -1,5 +1,5 @@ --- -data_category: optional +data_category: operational key_path: usage_activity_by_stage_monthly.package.projects_with_packages description: The total number of projects in a given month with at least one package product_section: ops diff --git a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml index 05603ec14e0..b8ca7aaa5ad 100644..100755 --- a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml +++ b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml @@ -167,6 +167,9 @@ options: - p_ci_templates_implicit_security_cluster_image_scanning - p_ci_templates_kaniko - p_ci_templates_qualys_iac_security + - p_ci_templates_liquibase + - p_ci_templates_matlab + - p_ci_templates_themekit distribution: - ce - ee diff --git a/config/metrics/counts_28d/20220307150912_p_ci_templates_database_liquibase_monthly.yml b/config/metrics/counts_28d/20220307150912_p_ci_templates_database_liquibase_monthly.yml new file mode 100644 index 00000000000..214c6504051 --- /dev/null +++ b/config/metrics/counts_28d/20220307150912_p_ci_templates_database_liquibase_monthly.yml @@ -0,0 +1,25 @@ +--- +key_path: redis_hll_counters.ci_templates.p_ci_templates_liquibase_monthly +description: "" +product_section: "" +product_stage: "" +product_group: "" +product_category: +value_type: number +status: active +milestone: "14.9" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81817 +time_frame: 28d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate +options: + events: + - p_ci_templates_liquibase diff --git a/config/metrics/counts_28d/20220310184327_p_ci_templates_matlab_monthly.yml b/config/metrics/counts_28d/20220310184327_p_ci_templates_matlab_monthly.yml new file mode 100644 index 00000000000..bd61f9ddc57 --- /dev/null +++ b/config/metrics/counts_28d/20220310184327_p_ci_templates_matlab_monthly.yml @@ -0,0 +1,25 @@ +--- +key_path: redis_hll_counters.ci_templates.p_ci_templates_matlab_monthly +description: "" +product_section: "" +product_stage: "" +product_group: "" +product_category: "" +value_type: number +status: active +milestone: "14.10" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82914 +time_frame: 28d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate +options: + events: + - p_ci_templates_matlab diff --git a/config/metrics/counts_28d/20220322194931_users_gitlab_cli_api_request_monthly.yml b/config/metrics/counts_28d/20220322194931_users_gitlab_cli_api_request_monthly.yml new file mode 100644 index 00000000000..2d534efba1c --- /dev/null +++ b/config/metrics/counts_28d/20220322194931_users_gitlab_cli_api_request_monthly.yml @@ -0,0 +1,26 @@ +--- +key_path: redis_hll_counters.code_review.i_code_review_user_gitlab_cli_api_request_monthly +description: Count of unique users per month who use the GitLab CLI +product_section: dev +product_stage: create +product_group: group::code review +product_category: editor_extension +value_type: number +status: active +milestone: "14.10" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83464 +time_frame: 28d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +options: + events: + - i_code_review_user_gitlab_cli_api_request +performance_indicator_type: [] +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/metrics/counts_28d/20220407125907_p_ci_templates_themekit_monthly.yml b/config/metrics/counts_28d/20220407125907_p_ci_templates_themekit_monthly.yml new file mode 100644 index 00000000000..1ee10431b4d --- /dev/null +++ b/config/metrics/counts_28d/20220407125907_p_ci_templates_themekit_monthly.yml @@ -0,0 +1,25 @@ +--- +key_path: redis_hll_counters.ci_templates.p_ci_templates_themekit_monthly +description: '' +product_section: '' +product_stage: '' +product_group: '' +product_category: '' +value_type: number +status: active +milestone: "14.10" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52279 +time_frame: 28d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +options: + events: + - p_ci_templates_themekit +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml index 290ceb5754a..b0cca62db12 100644..100755 --- a/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml +++ b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml @@ -167,6 +167,9 @@ options: - p_ci_templates_implicit_security_cluster_image_scanning - p_ci_templates_kaniko - p_ci_templates_qualys_iac_security + - p_ci_templates_liquibase + - p_ci_templates_matlab + - p_ci_templates_themekit distribution: - ce - ee diff --git a/config/metrics/counts_7d/20210916102312_templates_gitlab_slack_application_active.yml b/config/metrics/counts_7d/20210916102312_templates_gitlab_slack_application_active.yml index d465e1b3d03..27e0505c2cd 100644 --- a/config/metrics/counts_7d/20210916102312_templates_gitlab_slack_application_active.yml +++ b/config/metrics/counts_7d/20210916102312_templates_gitlab_slack_application_active.yml @@ -7,8 +7,9 @@ product_stage: ecosystem product_group: group::integrations product_category: integrations value_type: number -status: active +status: removed milestone: "14.3" +milestone_removed: "14.4" introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70496 time_frame: 7d data_source: database diff --git a/config/metrics/counts_7d/20220307150854_p_ci_templates_database_liquibase_weekly.yml b/config/metrics/counts_7d/20220307150854_p_ci_templates_database_liquibase_weekly.yml new file mode 100644 index 00000000000..c47c1fb51d5 --- /dev/null +++ b/config/metrics/counts_7d/20220307150854_p_ci_templates_database_liquibase_weekly.yml @@ -0,0 +1,25 @@ +--- +key_path: redis_hll_counters.ci_templates.p_ci_templates_liquibase_weekly +description: "" +product_section: "" +product_stage: "" +product_group: "" +product_category: "" +value_type: number +status: active +milestone: "14.9" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81817 +time_frame: 7d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate +options: + events: + - p_ci_templates_liquibase diff --git a/config/metrics/counts_7d/20220310184320_p_ci_templates_matlab_weekly.yml b/config/metrics/counts_7d/20220310184320_p_ci_templates_matlab_weekly.yml new file mode 100644 index 00000000000..0642003f672 --- /dev/null +++ b/config/metrics/counts_7d/20220310184320_p_ci_templates_matlab_weekly.yml @@ -0,0 +1,25 @@ +--- +key_path: redis_hll_counters.ci_templates.p_ci_templates_matlab_weekly +description: "" +product_section: "" +product_stage: "" +product_group: "" +product_category: "" +value_type: number +status: active +milestone: "14.10" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82914 +time_frame: 7d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate +options: + events: + - p_ci_templates_matlab diff --git a/config/metrics/counts_7d/20220322194922_users_gitlab_cli_api_request_weekly.yml b/config/metrics/counts_7d/20220322194922_users_gitlab_cli_api_request_weekly.yml new file mode 100644 index 00000000000..333e84873b4 --- /dev/null +++ b/config/metrics/counts_7d/20220322194922_users_gitlab_cli_api_request_weekly.yml @@ -0,0 +1,26 @@ +--- +key_path: redis_hll_counters.code_review.i_code_review_user_gitlab_cli_api_request_weekly +description: Count of unique users per week who use the GitLab CLI +product_section: dev +product_stage: create +product_group: group::code review +product_category: editor_extension +value_type: number +status: active +milestone: "14.10" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83464 +time_frame: 7d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +options: + events: + - i_code_review_user_gitlab_cli_api_request +performance_indicator_type: [] +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/metrics/counts_7d/20220407125901_p_ci_templates_themekit_weekly.yml b/config/metrics/counts_7d/20220407125901_p_ci_templates_themekit_weekly.yml new file mode 100644 index 00000000000..e464f1ee198 --- /dev/null +++ b/config/metrics/counts_7d/20220407125901_p_ci_templates_themekit_weekly.yml @@ -0,0 +1,25 @@ +--- +key_path: redis_hll_counters.ci_templates.p_ci_templates_themekit_weekly +description: '' +product_section: '' +product_stage: '' +product_group: '' +product_category: '' +value_type: number +status: active +milestone: "14.10" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52279 +time_frame: 7d +data_source: redis_hll +data_category: optional +instrumentation_class: RedisHLLMetric +options: + events: + - p_ci_templates_themekit +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/metrics/counts_all/20210216175045_merge_requests.yml b/config/metrics/counts_all/20210216175045_merge_requests.yml index 179a6258a15..2871c70abaa 100644 --- a/config/metrics/counts_all/20210216175045_merge_requests.yml +++ b/config/metrics/counts_all/20210216175045_merge_requests.yml @@ -7,7 +7,8 @@ product_stage: create product_group: group::code review product_category: code_review value_type: number -status: active +status: removed +milestone_removed: '14.10' time_frame: all data_source: database distribution: diff --git a/config/routes.rb b/config/routes.rb index 9342de492ec..41f06a412a3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -32,7 +32,7 @@ Rails.application.routes.draw do # 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/authorizations', as: :oauth_jira do + scope path: '/login/oauth', controller: 'oauth/jira_dvcs/authorizations', as: :oauth_jira_dvcs do get :authorize, action: :new get :callback post :access_token @@ -66,6 +66,7 @@ Rails.application.routes.draw do end Gitlab.ee do + resource :company, only: [:new, :create], controller: 'company' resources :groups, only: [:new, :create] resources :projects, only: [:new, :create] resources :groups_projects, only: [:new, :create] do @@ -236,6 +237,7 @@ Rails.application.routes.draw do resources :clusters, only: [:index, :new, :show, :update, :destroy] do collection do get :connect + get :new_cluster_docs post :create_user post :create_gcp post :create_aws @@ -323,7 +325,7 @@ Rails.application.routes.draw do root to: "root#index" - get '*unmatched_route', to: 'application#route_not_found' + get '*unmatched_route', to: 'application#route_not_found', format: false end Gitlab::Routing.add_helpers(TimeboxesRoutingHelper) diff --git a/config/routes/admin.rb b/config/routes/admin.rb index 6b786fc82b3..d066dd2fb35 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -105,7 +105,8 @@ namespace :admin do resources :projects, only: [:index] resources :usage_trends, only: :index - resource :dev_ops_report, controller: 'dev_ops_report', only: :show + resource :dev_ops_reports, controller: 'dev_ops_report', only: :show + get 'dev_ops_report', to: redirect('admin/dev_ops_reports') resources :cohorts, only: :index scope(path: 'projects/*namespace_id', diff --git a/config/routes/group.rb b/config/routes/group.rb index fecd3135cba..bf6094ff2f1 100644 --- a/config/routes/group.rb +++ b/config/routes/group.rb @@ -99,7 +99,7 @@ constraints(::Constraints::GroupUrlConstrainer.new) do delete :leave, on: :collection end - resources :group_links, only: [:create, :update, :destroy], constraints: { id: /\d+|:id/ } + resources :group_links, only: [:update, :destroy], constraints: { id: /\d+|:id/ } resources :uploads, only: [:create] do collection do @@ -135,7 +135,7 @@ constraints(::Constraints::GroupUrlConstrainer.new) do namespace :crm do resources :contacts, only: [:index, :new, :edit] - resources :organizations, only: [:index, :new] + resources :organizations, only: [:index, :new, :edit] end end diff --git a/config/routes/import.rb b/config/routes/import.rb index 9c76c4435ff..228c5776197 100644 --- a/config/routes/import.rb +++ b/config/routes/import.rb @@ -10,6 +10,8 @@ Devise.omniauth_providers.map(&:downcase).each do |provider| end namespace :import do + resources :history, only: [:index], controller: :history + resources :available_namespaces, only: [:index], controller: :available_namespaces namespace :url do diff --git a/config/routes/project.rb b/config/routes/project.rb index 1783f3acc68..a3f6139a6ef 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -247,7 +247,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do resources :starrers, only: [:index] resources :forks, only: [:index, :new, :create] - resources :group_links, only: [:create, :update, :destroy], constraints: { id: /\d+|:id/ } + resources :group_links, only: [:update, :destroy], constraints: { id: /\d+|:id/ } resource :import, only: [:new, :create, :show] resource :avatar, only: [:show, :destroy] diff --git a/config/routes/uploads.rb b/config/routes/uploads.rb index e2cdf8ba606..a72730c1214 100644 --- a/config/routes/uploads.rb +++ b/config/routes/uploads.rb @@ -38,6 +38,12 @@ scope path: :uploads do post ':model/authorize', to: 'uploads#authorize', constraints: { model: /personal_snippet|user/ } + + # Alert Metric Images + get "-/system/:model/:mounted_as/:id/:filename", + to: "uploads#show", + constraints: { model: /alert_management_metric_image/, mounted_as: /file/, filename: %r{[^/]+} }, + as: 'alert_metric_image_upload' end # Redirect old note attachments path to new uploads path. diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index a0f1ea4fa06..7ec142344ee 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -281,8 +281,6 @@ - 1 - - namespaceless_project_destroy - 1 -- - namespaces_invite_team_email - - 1 - - namespaces_onboarding_issue_created - 1 - - namespaces_onboarding_pipeline_created @@ -363,6 +361,8 @@ - 1 - - projects_process_sync_events - 1 +- - projects_record_target_platforms + - 1 - - projects_refresh_build_artifacts_size_statistics - 1 - - projects_schedule_bulk_repository_shard_moves @@ -415,6 +415,8 @@ - 1 - - security_findings_delete_by_job_id - 1 +- - security_orchestration_policy_rule_schedule_namespace + - 1 - - security_scans - 2 - - self_monitoring_project_create diff --git a/config/webpack.config.js b/config/webpack.config.js index 360c5be05d4..aff906353f6 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -326,7 +326,7 @@ module.exports = { ], }, { - test: /\.(worker(\.min)?\.js|pdf|bmpr)$/, + test: /\.(worker(\.min)?\.js|pdf)$/, exclude: /node_modules/, loader: 'file-loader', options: { @@ -702,7 +702,10 @@ module.exports = { const incrementalCompilerMiddleware = incrementalCompiler.createMiddleware(devServer); if (incrementalCompilerMiddleware) { - middlewares.unshift(incrementalCompilerMiddleware); + middlewares.unshift({ + name: 'incremental-compiler', + middleware: incrementalCompilerMiddleware, + }); } return middlewares; @@ -735,7 +738,7 @@ module.exports = { devtool: NO_SOURCEMAPS ? false : devtool, node: { - fs: 'empty', // sqljs requires fs + fs: 'empty', // editorconfig requires 'fs' setImmediate: false, }, }; diff --git a/config/webpack.vendor.config.js b/config/webpack.vendor.config.js index 30d60c0b5e6..ff38497a05e 100644 --- a/config/webpack.vendor.config.js +++ b/config/webpack.vendor.config.js @@ -28,7 +28,6 @@ module.exports = { 'jquery/dist/jquery.slim.js', 'pdfjs-dist/build/pdf', 'pdfjs-dist/build/pdf.worker.min', - 'sql.js', 'core-js', 'echarts', 'lodash', |