diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-20 09:16:11 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-20 09:16:11 +0000 |
| commit | edaa33dee2ff2f7ea3fac488d41558eb5f86d68c (patch) | |
| tree | 11f143effbfeba52329fb7afbd05e6e2a3790241 /config | |
| parent | d8a5691316400a0f7ec4f83832698f1988eb27c1 (diff) | |
| download | gitlab-ce-edaa33dee2ff2f7ea3fac488d41558eb5f86d68c.tar.gz | |
Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42
Diffstat (limited to 'config')
159 files changed, 554 insertions, 390 deletions
diff --git a/config/application.rb b/config/application.rb index f64e5c998eb..68b68c1c886 100644 --- a/config/application.rb +++ b/config/application.rb @@ -68,6 +68,9 @@ module Gitlab 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/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` diff --git a/config/environments/production.rb b/config/environments/production.rb index f8964479e60..b56aadb8b11 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -36,7 +36,9 @@ Rails.application.configure do # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. # config.force_ssl = true - # See everything in the log (default is :info) + # Include generic and useful information about system operation, but avoid logging too much + # information to avoid inadvertent exposure of personally identifiable information (PII). + # Note: This configuration does not affect the log level of `Gitlab::Logger` and its subclasses. config.log_level = :info # Suppress 'Rendered template ...' messages in the log diff --git a/config/feature_categories.yml b/config/feature_categories.yml index edc6541db8c..00b213d307b 100644 --- a/config/feature_categories.yml +++ b/config/feature_categories.yml @@ -7,7 +7,6 @@ # PLEASE DO NOT EDIT THIS FILE MANUALLY. # --- -- accessibility_testing - advanced_deployments - api_security - attack_emulation @@ -104,6 +103,8 @@ - review_apps - runbooks - runner +- runner_fleet +- runner_saas - scalability - secret_detection - secrets_management @@ -121,7 +122,6 @@ - synthetic_monitoring - team_planning - tracing -- usability_testing - usage_ping - users - utilization diff --git a/config/feature_flags/development/hide_access_tokens.yml b/config/feature_flags/development/bulk_expire_project_artifacts.yml index 1607780a0d0..609f87847fa 100644 --- a/config/feature_flags/development/hide_access_tokens.yml +++ b/config/feature_flags/development/bulk_expire_project_artifacts.yml @@ -1,8 +1,8 @@ --- -name: hide_access_tokens -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76280 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/347490 +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' type: development -group: group::access +group: group::testing default_enabled: true diff --git a/config/feature_flags/development/chat_notification_deployment_protected_branch_filter.yml b/config/feature_flags/development/chat_notification_deployment_protected_branch_filter.yml new file mode 100644 index 00000000000..0b81a06c593 --- /dev/null +++ b/config/feature_flags/development/chat_notification_deployment_protected_branch_filter.yml @@ -0,0 +1,8 @@ +--- +name: chat_notification_deployment_protected_branch_filter +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74423 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/349131 +milestone: '14.7' +type: development +group: group::integrations +default_enabled: false diff --git a/config/feature_flags/development/use_primary_store_as_default_for_sessions.yml b/config/feature_flags/development/ci_artifact_fast_removal_large_loop_limit.yml index ac130ab7761..bfb036bcc00 100644 --- a/config/feature_flags/development/use_primary_store_as_default_for_sessions.yml +++ b/config/feature_flags/development/ci_artifact_fast_removal_large_loop_limit.yml @@ -1,8 +1,8 @@ --- -name: use_primary_store_as_default_for_sessions -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75258 +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::memory +group: group::pipeline execution default_enabled: false diff --git a/config/feature_flags/development/ci_decompose_for_namespace_monthly_usage_query.yml b/config/feature_flags/development/ci_decompose_for_namespace_monthly_usage_query.yml new file mode 100644 index 00000000000..7b90c3e19b2 --- /dev/null +++ b/config/feature_flags/development/ci_decompose_for_namespace_monthly_usage_query.yml @@ -0,0 +1,8 @@ +--- +name: ci_decompose_for_namespace_monthly_usage_query +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77952 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350146 +milestone: '14.7' +type: development +group: group::pipeline execution +default_enabled: false diff --git a/config/feature_flags/development/ci_archived_build_trace_checksum.yml b/config/feature_flags/development/ci_destroy_all_expired_service.yml index 95e641e0efa..34c94529f99 100644 --- a/config/feature_flags/development/ci_archived_build_trace_checksum.yml +++ b/config/feature_flags/development/ci_destroy_all_expired_service.yml @@ -1,8 +1,8 @@ --- -name: ci_archived_build_trace_checksum -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70072 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340737 -milestone: '14.4' +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' type: development group: group::pipeline execution default_enabled: false diff --git a/config/feature_flags/development/cached_mr_widget.yml b/config/feature_flags/development/ci_find_runners_by_ci_mirrors.yml index 0a73eafe57e..337e6b11408 100644 --- a/config/feature_flags/development/cached_mr_widget.yml +++ b/config/feature_flags/development/ci_find_runners_by_ci_mirrors.yml @@ -1,8 +1,8 @@ --- -name: cached_mr_widget -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61584 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330803 -milestone: '13.12' +name: ci_find_runners_by_ci_mirrors +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74900 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/347226 +milestone: '14.7' type: development -group: group::code review +group: group::runner default_enabled: false diff --git a/config/feature_flags/development/ci_store_trace_outside_transaction.yml b/config/feature_flags/development/ci_owned_runners_cross_joins_fix.yml index 1be425c6bbf..aacb188ba35 100644 --- a/config/feature_flags/development/ci_store_trace_outside_transaction.yml +++ b/config/feature_flags/development/ci_owned_runners_cross_joins_fix.yml @@ -1,8 +1,8 @@ --- -name: ci_store_trace_outside_transaction -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66203 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/336280 -milestone: '14.5' +name: ci_owned_runners_cross_joins_fix +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78216 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350322 +milestone: '14.8' type: development group: group::pipeline execution -default_enabled: true +default_enabled: false diff --git a/config/feature_flags/development/ci_retry_downstream_pipeline.yml b/config/feature_flags/development/ci_retry_downstream_pipeline.yml index 0eac0330188..69a2821c86e 100644 --- a/config/feature_flags/development/ci_retry_downstream_pipeline.yml +++ b/config/feature_flags/development/ci_retry_downstream_pipeline.yml @@ -2,7 +2,7 @@ name: ci_retry_downstream_pipeline introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76115 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/347424 -milestone: '14.16' +milestone: '14.6' type: development group: group::pipeline authoring default_enabled: false diff --git a/config/feature_flags/development/ci_skip_legacy_extra_minutes_recalculation.yml b/config/feature_flags/development/ci_skip_legacy_extra_minutes_recalculation.yml new file mode 100644 index 00000000000..2b10b124c54 --- /dev/null +++ b/config/feature_flags/development/ci_skip_legacy_extra_minutes_recalculation.yml @@ -0,0 +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' +type: development +group: group::pipeline execution +default_enabled: false diff --git a/config/feature_flags/development/ci_skip_require_credit_card_for_addon_ci_minutes.yml b/config/feature_flags/development/ci_skip_require_credit_card_for_addon_ci_minutes.yml new file mode 100644 index 00000000000..e9c355bd119 --- /dev/null +++ b/config/feature_flags/development/ci_skip_require_credit_card_for_addon_ci_minutes.yml @@ -0,0 +1,8 @@ +--- +name: ci_skip_require_credit_card_for_addon_ci_minutes +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77829 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/349841 +milestone: '14.7' +type: development +group: group::fulfillment +default_enabled: false diff --git a/config/feature_flags/development/ci_use_variables_builder_definitions.yml b/config/feature_flags/development/ci_use_variables_builder_definitions.yml new file mode 100644 index 00000000000..c01e4e9958e --- /dev/null +++ b/config/feature_flags/development/ci_use_variables_builder_definitions.yml @@ -0,0 +1,8 @@ +--- +name: ci_use_variables_builder_definitions +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75254 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/349049 +milestone: '14.7' +type: development +group: group::pipeline execution +default_enabled: false diff --git a/config/feature_flags/development/sidekiq_push_bulk_in_batches.yml b/config/feature_flags/development/container_registry_cdn_redirect.yml index ea4c5253856..5cc2bf7a342 100644 --- a/config/feature_flags/development/sidekiq_push_bulk_in_batches.yml +++ b/config/feature_flags/development/container_registry_cdn_redirect.yml @@ -1,8 +1,8 @@ --- -name: sidekiq_push_bulk_in_batches -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72263 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343740 -milestone: '14.5' +name: container_registry_cdn_redirect +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77705 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/349717 +milestone: '14.7' type: development -group: group::access +group: group::package default_enabled: false diff --git a/config/feature_flags/development/create_deployment_in_separate_transaction.yml b/config/feature_flags/development/create_deployment_in_separate_transaction.yml index 7d07a932966..96cda772beb 100644 --- a/config/feature_flags/development/create_deployment_in_separate_transaction.yml +++ b/config/feature_flags/development/create_deployment_in_separate_transaction.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/346879 milestone: '14.6' type: development group: group::release -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/create_project_namespace_on_project_create.yml b/config/feature_flags/development/create_project_namespace_on_project_create.yml index 3fbf929ca2e..0d6ea8b2784 100644 --- a/config/feature_flags/development/create_project_namespace_on_project_create.yml +++ b/config/feature_flags/development/create_project_namespace_on_project_create.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344954 milestone: '14.5' type: development group: group::workspace -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/custom_preloader_for_deployments.yml b/config/feature_flags/development/custom_preloader_for_deployments.yml new file mode 100644 index 00000000000..f8abcb4ba4a --- /dev/null +++ b/config/feature_flags/development/custom_preloader_for_deployments.yml @@ -0,0 +1,8 @@ +--- +name: custom_preloader_for_deployments +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75767 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/348289 +milestone: '14.7' +type: development +group: group::release +default_enabled: false diff --git a/config/feature_flags/development/dast_view_scans.yml b/config/feature_flags/development/dast_api_scanner.yml index 736fcb01091..8299004fecb 100644 --- a/config/feature_flags/development/dast_view_scans.yml +++ b/config/feature_flags/development/dast_api_scanner.yml @@ -1,8 +1,8 @@ --- -name: dast_view_scans -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69571 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340388 -milestone: '14.3' +name: dast_api_scanner +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73564 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345837 +milestone: '14.7' type: development group: group::dynamic analysis -default_enabled: true +default_enabled: false diff --git a/config/feature_flags/development/datadog_integration_logs_collection.yml b/config/feature_flags/development/datadog_integration_logs_collection.yml new file mode 100644 index 00000000000..5bd155eece9 --- /dev/null +++ b/config/feature_flags/development/datadog_integration_logs_collection.yml @@ -0,0 +1,8 @@ +--- +name: datadog_integration_logs_collection +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74725 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/346339 +milestone: '14.8' +type: development +group: group::integrations +default_enabled: false diff --git a/config/feature_flags/development/delete_branch_confirmation_modals.yml b/config/feature_flags/development/delete_branch_confirmation_modals.yml deleted file mode 100644 index 9959d8fe8e2..00000000000 --- a/config/feature_flags/development/delete_branch_confirmation_modals.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: delete_branch_confirmation_modals -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56782 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/329052 -milestone: '14.3' -type: development -group: group::expansion -default_enabled: true diff --git a/config/feature_flags/development/dependency_proxy_workhorse.yml b/config/feature_flags/development/dependency_proxy_workhorse.yml deleted file mode 100644 index a14f38fa001..00000000000 --- a/config/feature_flags/development/dependency_proxy_workhorse.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: dependency_proxy_workhorse -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68157 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339639 -milestone: '14.3' -type: development -group: group::source code -default_enabled: true diff --git a/config/feature_flags/development/expire_job_and_pipeline_cache_synchronously.yml b/config/feature_flags/development/expire_job_and_pipeline_cache_synchronously.yml deleted file mode 100644 index dda23cb641a..00000000000 --- a/config/feature_flags/development/expire_job_and_pipeline_cache_synchronously.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: expire_job_and_pipeline_cache_synchronously -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75611 -rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/1380 -milestone: '14.6' -type: development -group: group::project management -default_enabled: false diff --git a/config/feature_flags/development/find_tag_via_gitaly.yml b/config/feature_flags/development/find_tag_via_gitaly.yml deleted file mode 100644 index 43cbdb3993f..00000000000 --- a/config/feature_flags/development/find_tag_via_gitaly.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: find_tag_via_gitaly -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70181 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340899 -milestone: '14.3' -type: development -group: group::source code -default_enabled: true diff --git a/config/feature_flags/development/vue_issuables_list.yml b/config/feature_flags/development/fix_comment_scroll.yml index 75ef82999ca..706cd816288 100644 --- a/config/feature_flags/development/vue_issuables_list.yml +++ b/config/feature_flags/development/fix_comment_scroll.yml @@ -1,8 +1,8 @@ --- -name: vue_issuables_list -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/15091 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/208093 -milestone: '12.5' +name: fix_comment_scroll +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76340 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/349638 +milestone: '14.7' type: development group: group::project management default_enabled: false diff --git a/config/feature_flags/development/github_importer_use_diff_note_with_suggestions.yml b/config/feature_flags/development/github_importer_use_diff_note_with_suggestions.yml index c106d5131ff..c7f8d9f4943 100644 --- a/config/feature_flags/development/github_importer_use_diff_note_with_suggestions.yml +++ b/config/feature_flags/development/github_importer_use_diff_note_with_suggestions.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344309 milestone: '14.5' type: development group: group::import -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/graphql_ci_runner_executor.yml b/config/feature_flags/development/graphql_ci_runner_executor.yml new file mode 100644 index 00000000000..f58482b32d8 --- /dev/null +++ b/config/feature_flags/development/graphql_ci_runner_executor.yml @@ -0,0 +1,8 @@ +--- +name: graphql_ci_runner_executor +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76534 +rollout_issue_url: +milestone: '14.7' +type: development +group: group::runner +default_enabled: false diff --git a/config/feature_flags/development/import_redis_increment_by.yml b/config/feature_flags/development/import_redis_increment_by.yml index bc2e5f97860..9932c8e868e 100644 --- a/config/feature_flags/development/import_redis_increment_by.yml +++ b/config/feature_flags/development/import_redis_increment_by.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/336226 milestone: '14.1' type: development group: group::import -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/improved_container_scan_matching.yml b/config/feature_flags/development/improved_container_scan_matching.yml deleted file mode 100644 index 81a486831cc..00000000000 --- a/config/feature_flags/development/improved_container_scan_matching.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: improved_container_scan_matching -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73486 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344534 -milestone: '14.6' -type: development -group: group::container security -default_enabled: true diff --git a/config/feature_flags/development/multiple_gpg_signatures.yml b/config/feature_flags/development/inline_haml_diff_line_rendering.yml index 433309aea58..a5e1f010c16 100644 --- a/config/feature_flags/development/multiple_gpg_signatures.yml +++ b/config/feature_flags/development/inline_haml_diff_line_rendering.yml @@ -1,8 +1,8 @@ --- -name: multiple_gpg_signatures -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74095 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345261 -milestone: '14.5' +name: inline_haml_diff_line_rendering +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57237 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330582 +milestone: '14.7' type: development group: group::source code -default_enabled: true +default_enabled: false diff --git a/config/feature_flags/development/lfs_auto_link_fork_source.yml b/config/feature_flags/development/lfs_auto_link_fork_source.yml index 022bcdd3128..e14daa6b30b 100644 --- a/config/feature_flags/development/lfs_auto_link_fork_source.yml +++ b/config/feature_flags/development/lfs_auto_link_fork_source.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/348243 milestone: '14.6' type: development group: group::source code -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/lfs_link_existing_object.yml b/config/feature_flags/development/lfs_link_existing_object.yml index b8a0b810209..9388e7de8b5 100644 --- a/config/feature_flags/development/lfs_link_existing_object.yml +++ b/config/feature_flags/development/lfs_link_existing_object.yml @@ -2,6 +2,7 @@ name: lfs_link_existing_object introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41770 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/249246 +milestone: '13.4' group: group::source code type: development default_enabled: false diff --git a/config/feature_flags/development/linear_mirrors_worker_roots.yml b/config/feature_flags/development/linear_mirrors_worker_roots.yml new file mode 100644 index 00000000000..5595cea6504 --- /dev/null +++ b/config/feature_flags/development/linear_mirrors_worker_roots.yml @@ -0,0 +1,8 @@ +--- +name: linear_mirrors_worker_roots +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76735 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/348415 +milestone: '14.7' +type: development +group: group::authentication and authorization +default_enabled: false diff --git a/config/feature_flags/development/linear_user_group_notification_settings_finder_ancestors_scopes.yml b/config/feature_flags/development/linear_user_group_notification_settings_finder_ancestors_scopes.yml deleted file mode 100644 index b54b82d00a0..00000000000 --- a/config/feature_flags/development/linear_user_group_notification_settings_finder_ancestors_scopes.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: linear_user_group_notification_settings_finder_ancestors_scopes -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74606 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345792 -milestone: '14.6' -type: development -group: group::access -default_enabled: false diff --git a/config/feature_flags/development/migrate_vulnerability_finding_uuids.yml b/config/feature_flags/development/migrate_vulnerability_finding_uuids.yml new file mode 100644 index 00000000000..dc168ba5374 --- /dev/null +++ b/config/feature_flags/development/migrate_vulnerability_finding_uuids.yml @@ -0,0 +1,8 @@ +--- +name: migrate_vulnerability_finding_uuids +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75546 +rollout_issue_url: +milestone: '14.7' +type: development +group: group::threat insights +default_enabled: true diff --git a/config/feature_flags/development/operational_vulnerabilities.yml b/config/feature_flags/development/operational_vulnerabilities.yml deleted file mode 100644 index ac92892592b..00000000000 --- a/config/feature_flags/development/operational_vulnerabilities.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: operational_vulnerabilities -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70732 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341423 -milestone: '14.4' -type: development -group: group::container security -default_enabled: true diff --git a/config/feature_flags/development/optimized_issue_neighbor_queries.yml b/config/feature_flags/development/optimized_issue_neighbor_queries.yml deleted file mode 100644 index db333dace72..00000000000 --- a/config/feature_flags/development/optimized_issue_neighbor_queries.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: optimized_issue_neighbor_queries -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76073 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345921 -milestone: '14.6' -type: development -group: group::project management -default_enabled: false diff --git a/config/feature_flags/development/scim_token_vue.yml b/config/feature_flags/development/packages_installable_package_files.yml index 8cc82bafd66..ed0091f41e2 100644 --- a/config/feature_flags/development/scim_token_vue.yml +++ b/config/feature_flags/development/packages_installable_package_files.yml @@ -1,8 +1,8 @@ --- -name: scim_token_vue -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74743 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/347270 +name: packages_installable_package_files +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76767 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/348677 milestone: '14.6' type: development -group: group::access +group: group::package default_enabled: true diff --git a/config/feature_flags/development/paginatable_namespace_drop_down_for_project_creation.yml b/config/feature_flags/development/paginatable_namespace_drop_down_for_project_creation.yml deleted file mode 100644 index f0f60d4d0b7..00000000000 --- a/config/feature_flags/development/paginatable_namespace_drop_down_for_project_creation.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: paginatable_namespace_drop_down_for_project_creation -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66112 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338930 -milestone: '14.3' -type: development -group: group::project management -default_enabled: true diff --git a/config/feature_flags/development/permitted_attributes_for_import_export.yml b/config/feature_flags/development/permitted_attributes_for_import_export.yml deleted file mode 100644 index da5168b6ab8..00000000000 --- a/config/feature_flags/development/permitted_attributes_for_import_export.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: permitted_attributes_for_import_export -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70168 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340789 -milestone: '14.4' -type: development -group: group::import -default_enabled: true diff --git a/config/feature_flags/development/verify_participants_access.yml b/config/feature_flags/development/rate_limit_gitlab_shell.yml index 8857003fd47..ceb9e86b01c 100644 --- a/config/feature_flags/development/verify_participants_access.yml +++ b/config/feature_flags/development/rate_limit_gitlab_shell.yml @@ -1,8 +1,8 @@ --- -name: verify_participants_access -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74906 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/347407 -milestone: '14.6' +name: rate_limit_gitlab_shell +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78373 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350465 +milestone: '14.7' type: development group: group::source code default_enabled: false diff --git a/config/feature_flags/development/loose_index_scan_for_distinct_values.yml b/config/feature_flags/development/rate_limit_profile_update_username.yml index 84f693d9247..e72e3d605e3 100644 --- a/config/feature_flags/development/loose_index_scan_for_distinct_values.yml +++ b/config/feature_flags/development/rate_limit_profile_update_username.yml @@ -1,8 +1,8 @@ --- -name: loose_index_scan_for_distinct_values -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55985 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/324210 -milestone: '13.10' +name: rate_limit_profile_update_username +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77221 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/349132 +milestone: '14.7' type: development group: group::optimize default_enabled: false diff --git a/config/feature_flags/development/linear_group_descendants_finder.yml b/config/feature_flags/development/rate_limit_user_by_id_endpoint.yml index 12f09c25c85..d5523b7541b 100644 --- a/config/feature_flags/development/linear_group_descendants_finder.yml +++ b/config/feature_flags/development/rate_limit_user_by_id_endpoint.yml @@ -1,8 +1,8 @@ --- -name: linear_group_descendants_finder -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68954 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339440 +name: rate_limit_user_by_id_endpoint +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73069 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/348796 milestone: '14.6' type: development -group: group::access +group: group::optimize default_enabled: false diff --git a/config/feature_flags/development/rate_limit_user_sign_up_endpoint.yml b/config/feature_flags/development/rate_limit_user_sign_up_endpoint.yml new file mode 100644 index 00000000000..af1957e54c8 --- /dev/null +++ b/config/feature_flags/development/rate_limit_user_sign_up_endpoint.yml @@ -0,0 +1,8 @@ +--- +name: rate_limit_user_sign_up_endpoint +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77835 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/349843 +milestone: '14.7' +type: development +group: group::optimize +default_enabled: false diff --git a/config/feature_flags/development/rate_limit_username_exists_endpoint.yml b/config/feature_flags/development/rate_limit_username_exists_endpoint.yml new file mode 100644 index 00000000000..5a82dc96943 --- /dev/null +++ b/config/feature_flags/development/rate_limit_username_exists_endpoint.yml @@ -0,0 +1,8 @@ +--- +name: rate_limit_username_exists_endpoint +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77119 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/348974 +milestone: '14.7' +type: development +group: group::optimize +default_enabled: false diff --git a/config/feature_flags/development/rebase_without_ci_ui.yml b/config/feature_flags/development/rebase_without_ci_ui.yml new file mode 100644 index 00000000000..b05711ced29 --- /dev/null +++ b/config/feature_flags/development/rebase_without_ci_ui.yml @@ -0,0 +1,8 @@ +--- +name: rebase_without_ci_ui +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78194 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350262 +milestone: '14.7' +type: development +group: group::pipeline execution +default_enabled: false diff --git a/config/feature_flags/development/optimize_merge_request_parser.yml b/config/feature_flags/development/remote_mirror_fail_on_lfs.yml index 9e65f5412c4..4bbaa92a5b0 100644 --- a/config/feature_flags/development/optimize_merge_request_parser.yml +++ b/config/feature_flags/development/remote_mirror_fail_on_lfs.yml @@ -1,8 +1,8 @@ --- -name: optimize_merge_request_parser -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62490/ -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/331893 -milestone: '14.0' +name: remote_mirror_fail_on_lfs +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77339 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/349262 +milestone: '14.7' type: development group: group::source code default_enabled: false diff --git a/config/feature_flags/development/vue_epics_list.yml b/config/feature_flags/development/runner_read_only_admin_view.yml index 22e2a53aeee..8053c31df6a 100644 --- a/config/feature_flags/development/vue_epics_list.yml +++ b/config/feature_flags/development/runner_read_only_admin_view.yml @@ -1,8 +1,8 @@ --- -name: vue_epics_list -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46769 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/276189 -milestone: '13.9' +name: runner_read_only_admin_view +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77682 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350164 +milestone: '14.7' type: development -group: group::product planning +group: group::runner default_enabled: false diff --git a/config/feature_flags/development/admin_deploy_keys_vue.yml b/config/feature_flags/development/sandboxed_mermaid.yml index 21e1b501d7a..434cd4055d8 100644 --- a/config/feature_flags/development/admin_deploy_keys_vue.yml +++ b/config/feature_flags/development/sandboxed_mermaid.yml @@ -1,8 +1,8 @@ --- -name: admin_deploy_keys_vue -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73580 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344855 -milestone: '14.5' +name: sandboxed_mermaid +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74414 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/349755 +milestone: '14.7' type: development -group: group::access +group: group::analyzer frontend default_enabled: true diff --git a/config/feature_flags/development/show_relevant_approval_rule_approvers.yml b/config/feature_flags/development/show_relevant_approval_rule_approvers.yml deleted file mode 100644 index 233f6916896..00000000000 --- a/config/feature_flags/development/show_relevant_approval_rule_approvers.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: show_relevant_approval_rule_approvers -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60339 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/329153 -milestone: '13.12' -type: development -group: group::source code -default_enabled: true diff --git a/config/feature_flags/development/sourcegraph.yml b/config/feature_flags/development/sourcegraph.yml index 12170aec869..f9aa76f6c7c 100644 --- a/config/feature_flags/development/sourcegraph.yml +++ b/config/feature_flags/development/sourcegraph.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/292199 milestone: '12.5' type: development group: group::editor -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/swimlanes_buffered_rendering.yml b/config/feature_flags/development/swimlanes_buffered_rendering.yml deleted file mode 100644 index 30da5383406..00000000000 --- a/config/feature_flags/development/swimlanes_buffered_rendering.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: swimlanes_buffered_rendering -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56614 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/324994 -milestone: '13.11' -type: development -group: group::product planning -default_enabled: false
\ No newline at end of file diff --git a/config/feature_flags/development/deployments_archive.yml b/config/feature_flags/development/track_geo_proxy_events.yml index 8129d6d4af8..29e8d771adf 100644 --- a/config/feature_flags/development/deployments_archive.yml +++ b/config/feature_flags/development/track_geo_proxy_events.yml @@ -1,8 +1,8 @@ --- -name: deployments_archive -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73628 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345027 -milestone: '14.5' +name: track_geo_proxy_events +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76587 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/348414 +milestone: '14.7' type: development -group: group::release +group: group::geo default_enabled: true diff --git a/config/feature_flags/development/log_import_export_relation_creation.yml b/config/feature_flags/development/trigger_job_retry_action.yml index 04d1b1e5d4f..79a8593fd05 100644 --- a/config/feature_flags/development/log_import_export_relation_creation.yml +++ b/config/feature_flags/development/trigger_job_retry_action.yml @@ -1,8 +1,8 @@ --- -name: log_import_export_relation_creation -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27605 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/282245 -milestone: '12.10' +name: trigger_job_retry_action +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77951 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/349966 +milestone: '14.7' type: development -group: group::import +group: group::pipeline authoring default_enabled: false diff --git a/config/feature_flags/development/unify_security_configuration.yml b/config/feature_flags/development/unify_security_configuration.yml new file mode 100644 index 00000000000..bbc4489ec82 --- /dev/null +++ b/config/feature_flags/development/unify_security_configuration.yml @@ -0,0 +1,8 @@ +--- +name: unify_security_configuration +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76866 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350177 +milestone: '14.7' +type: development +group: group::composition analysis +default_enabled: false diff --git a/config/feature_flags/development/use_cmark_renderer.yml b/config/feature_flags/development/use_cmark_renderer.yml deleted file mode 100644 index 5e4ea534590..00000000000 --- a/config/feature_flags/development/use_cmark_renderer.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: use_cmark_renderer -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61792 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345744 -milestone: '14.6' -type: development -group: group::project management -default_enabled: true diff --git a/config/feature_flags/development/use_primary_and_secondary_stores_for_sessions.yml b/config/feature_flags/development/use_primary_and_secondary_stores_for_sessions.yml deleted file mode 100644 index 2204472c0a6..00000000000 --- a/config/feature_flags/development/use_primary_and_secondary_stores_for_sessions.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: use_primary_and_secondary_stores_for_sessions -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73660 -rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/1429 -milestone: '14.6' -type: development -group: group::memory -default_enabled: false diff --git a/config/feature_flags/development/use_traversal_ids.yml b/config/feature_flags/development/use_traversal_ids.yml index e9fd2d03737..ab3a2eaf733 100644 --- a/config/feature_flags/development/use_traversal_ids.yml +++ b/config/feature_flags/development/use_traversal_ids.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56296 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321948 milestone: '13.11' type: development -group: group::access +group: group::workspace default_enabled: false diff --git a/config/feature_flags/development/use_traversal_ids_for_ancestor_scopes.yml b/config/feature_flags/development/use_traversal_ids_for_ancestor_scopes.yml index 7f398fc5f0b..e2619ef5231 100644 --- a/config/feature_flags/development/use_traversal_ids_for_ancestor_scopes.yml +++ b/config/feature_flags/development/use_traversal_ids_for_ancestor_scopes.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67652 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340159 milestone: '14.3' type: development -group: group::access +group: group::workspace default_enabled: false diff --git a/config/feature_flags/development/use_traversal_ids_for_ancestors.yml b/config/feature_flags/development/use_traversal_ids_for_ancestors.yml index ae5f154a6bc..4a89aac140d 100644 --- a/config/feature_flags/development/use_traversal_ids_for_ancestors.yml +++ b/config/feature_flags/development/use_traversal_ids_for_ancestors.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57137 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/334952 milestone: '13.12' type: development -group: group::access +group: group::workspace default_enabled: false diff --git a/config/feature_flags/development/use_traversal_ids_for_ancestors_upto.yml b/config/feature_flags/development/use_traversal_ids_for_ancestors_upto.yml index 4fe7ca695c3..9da967f87ea 100644 --- a/config/feature_flags/development/use_traversal_ids_for_ancestors_upto.yml +++ b/config/feature_flags/development/use_traversal_ids_for_ancestors_upto.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72662 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343619 milestone: '14.6' type: development -group: group::access +group: group::workspace default_enabled: false diff --git a/config/feature_flags/development/use_traversal_ids_for_root_ancestor.yml b/config/feature_flags/development/use_traversal_ids_for_root_ancestor.yml index be02645720e..74ae139b68a 100644 --- a/config/feature_flags/development/use_traversal_ids_for_root_ancestor.yml +++ b/config/feature_flags/development/use_traversal_ids_for_root_ancestor.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61163 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/331907 milestone: '14.0' type: development -group: group::access +group: group::workspace default_enabled: false diff --git a/config/feature_flags/development/use_optimized_group_labels_query.yml b/config/feature_flags/development/use_traversal_ids_for_self_and_hierarchy.yml index 82cecb5f337..06bddc2aa1c 100644 --- a/config/feature_flags/development/use_optimized_group_labels_query.yml +++ b/config/feature_flags/development/use_traversal_ids_for_self_and_hierarchy.yml @@ -1,8 +1,8 @@ --- -name: use_optimized_group_labels_query -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73501 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/344957 -milestone: '14.5' +name: use_traversal_ids_for_self_and_hierarchy +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76814 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/348527 +milestone: '14.7' type: development group: group::workspace -default_enabled: true +default_enabled: false diff --git a/config/feature_flags/development/use_traversal_ids_groups_finder.yml b/config/feature_flags/development/use_traversal_ids_groups_finder.yml index b0550fe62d9..2f35ede7e87 100644 --- a/config/feature_flags/development/use_traversal_ids_groups_finder.yml +++ b/config/feature_flags/development/use_traversal_ids_groups_finder.yml @@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67650 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345666 milestone: '14.6' type: development -group: group::access +group: group::workspace default_enabled: false diff --git a/config/feature_flags/development/use_typhoeus_elasticsearch_adapter.yml b/config/feature_flags/development/use_typhoeus_elasticsearch_adapter.yml new file mode 100644 index 00000000000..ac762395cd2 --- /dev/null +++ b/config/feature_flags/development/use_typhoeus_elasticsearch_adapter.yml @@ -0,0 +1,8 @@ +--- +name: use_typhoeus_elasticsearch_adapter +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76879 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/348607 +milestone: '14.7' +type: development +group: group::global search +default_enabled: false diff --git a/config/feature_flags/development/jira_use_first_ref_by_oid.yml b/config/feature_flags/development/vue_integration_form.yml index 88db6c1ab4c..a11c42b8d4a 100644 --- a/config/feature_flags/development/jira_use_first_ref_by_oid.yml +++ b/config/feature_flags/development/vue_integration_form.yml @@ -1,8 +1,8 @@ --- -name: jira_use_first_ref_by_oid -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72739 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343585 -milestone: '14.5' +name: vue_integration_form +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77934 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350444 +milestone: '14.7' type: development group: group::integrations -default_enabled: true +default_enabled: false diff --git a/config/feature_flags/development/vulnerability_finding_replace_metadata.yml b/config/feature_flags/development/vulnerability_finding_replace_metadata.yml index f7b3cb67c38..2774547668f 100644 --- a/config/feature_flags/development/vulnerability_finding_replace_metadata.yml +++ b/config/feature_flags/development/vulnerability_finding_replace_metadata.yml @@ -2,6 +2,7 @@ name: vulnerability_finding_replace_metadata introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66868 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337253 +milestone: '14.2' group: group::threat insights type: development -default_enabled: false
\ No newline at end of file +default_enabled: false diff --git a/config/feature_flags/development/vulnerability_location_image_filter.yml b/config/feature_flags/development/vulnerability_location_image_filter.yml deleted file mode 100644 index 1bbc8e43d57..00000000000 --- a/config/feature_flags/development/vulnerability_location_image_filter.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: vulnerability_location_image_filter -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69867 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340915 -milestone: '14.4' -type: development -group: group::container security -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 index f499263acec..dbdf2d616d2 100644 --- 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 @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345398 milestone: '14.6' type: development group: group::editor -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/experiment/logged_out_marketing_header.yml b/config/feature_flags/experiment/logged_out_marketing_header.yml new file mode 100644 index 00000000000..8bc09d59b16 --- /dev/null +++ b/config/feature_flags/experiment/logged_out_marketing_header.yml @@ -0,0 +1,8 @@ +--- +name: logged_out_marketing_header +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76076 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/348525 +milestone: '14.7' +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 new file mode 100644 index 00000000000..33ffcadb5c0 --- /dev/null +++ b/config/feature_flags/experiment/pql_three_cta_test.yml @@ -0,0 +1,8 @@ +--- +name: pql_three_cta_test +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74054 +rollout_issue_url: +milestone: '14.7' +type: experiment +group: group::conversion +default_enabled: false diff --git a/config/feature_flags/experiment/require_verification_for_group_creation.yml b/config/feature_flags/experiment/require_verification_for_group_creation.yml new file mode 100644 index 00000000000..767d5f55bce --- /dev/null +++ b/config/feature_flags/experiment/require_verification_for_group_creation.yml @@ -0,0 +1,8 @@ +--- +name: require_verification_for_group_creation +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77569 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/349857 +milestone: '14.7' +type: experiment +group: group::activation +default_enabled: false diff --git a/config/feature_flags/experiment/require_verification_for_namespace_creation.yml b/config/feature_flags/experiment/require_verification_for_namespace_creation.yml new file mode 100644 index 00000000000..5772d3217b8 --- /dev/null +++ b/config/feature_flags/experiment/require_verification_for_namespace_creation.yml @@ -0,0 +1,8 @@ +--- +name: require_verification_for_namespace_creation +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77315 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350251 +milestone: '14.8' +type: experiment +group: group::activation +default_enabled: false diff --git a/config/feature_flags/ops/ci_unsafe_regexp_logger.yml b/config/feature_flags/ops/ci_unsafe_regexp_logger.yml new file mode 100644 index 00000000000..00dbab724f8 --- /dev/null +++ b/config/feature_flags/ops/ci_unsafe_regexp_logger.yml @@ -0,0 +1,8 @@ +--- +name: ci_unsafe_regexp_logger +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78458 +rollout_issue_url: +milestone: '14.8' +type: ops +group: group::pipeline authoring +default_enabled: true diff --git a/config/feature_flags/development/log_implicit_sidekiq_status_calls.yml b/config/feature_flags/ops/gitlab_gtm_datalayer.yml index 1aeb768b3dd..f41506ce114 100644 --- a/config/feature_flags/development/log_implicit_sidekiq_status_calls.yml +++ b/config/feature_flags/ops/gitlab_gtm_datalayer.yml @@ -1,8 +1,8 @@ --- -name: log_implicit_sidekiq_status_calls -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74815 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343964 +name: gitlab_gtm_datalayer +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76305 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/348932 milestone: '14.6' -type: development -group: group::scalability +type: ops +group: group::buyer experience default_enabled: false diff --git a/config/feature_flags/ops/prometheus_notify_max_alerts.yml b/config/feature_flags/ops/prometheus_notify_max_alerts.yml new file mode 100644 index 00000000000..2861299d9bf --- /dev/null +++ b/config/feature_flags/ops/prometheus_notify_max_alerts.yml @@ -0,0 +1,8 @@ +--- +name: prometheus_notify_max_alerts +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/77168 +rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/production/-/issues/6086 +milestone: '14.7' +type: ops +group: group::monitor +default_enabled: false diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 05eab1a9b43..f5755591da7 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -9,6 +9,8 @@ # If you change this file in a merge request, please also create # # a MR on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests. # # For more details see https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/settings/gitlab.yml.md # +# Be sure to create a MR against the GDK configuration # +# file (https://gitlab.com/gitlab-org/gitlab-development-kit/-/blob/main/support/templates/gitlab/config/gitlab.yml.erb) too. # ######################################################################## # # @@ -228,6 +230,10 @@ production: &base # client_id: "YOUR-CLIENT-ID" # client_secret: "YOUR-CLIENT-SECRET" + # File that contains the shared secret key for verifying access for mailroom's incoming_email. + # Default is '.gitlab_mailroom_secret' relative to Rails.root (i.e. root of the GitLab app). + # secret_file: /home/git/gitlab/.gitlab_mailroom_secret + ## Consolidated object store config ## This will only take effect if the object_store sections are not defined ## within the types (e.g. artifacts, lfs, etc.). @@ -1421,6 +1427,18 @@ test: aws_secret_access_key: AWS_SECRET_ACCESS_KEY region: us-east-1 + ci_secure_files: + enabled: true + storage_path: tmp/tests/ci_secure_files + object_store: + enabled: false + remote_directory: ci_secure_files + connection: + provider: AWS # Only AWS supported at the moment + aws_access_key_id: AWS_ACCESS_KEY_ID + aws_secret_access_key: AWS_SECRET_ACCESS_KEY + region: us-east-1 + gitlab: host: localhost port: 80 diff --git a/config/helpers/patched_crypto.js b/config/helpers/patched_crypto.js new file mode 100644 index 00000000000..235242195b1 --- /dev/null +++ b/config/helpers/patched_crypto.js @@ -0,0 +1,22 @@ +/** + * Webpack 4 uses md4 internally because it is fast. + * Some loaders also use md5 directly. + * It is not available systems with FIPS enabled node. + * + * This is a hack to monkey patch the crypto function to use + * another algorithm if md4 or md5 is expected. + * + * https://github.com/webpack/webpack/issues/13572#issuecomment-923736472 + * + * This hack can be removed once we upgrade to webpack v5 as + * it includes native support for configuring hash options: + * https://github.com/webpack/webpack/pull/14306 + */ +const crypto = require('crypto'); + +const cryptoHashOriginal = crypto.createHash; + +crypto.createHash = (algorithm) => + cryptoHashOriginal(['md4', 'md5'].includes(algorithm) ? 'sha256' : algorithm); + +module.exports = crypto; diff --git a/config/helpers/vendor_dll_hash.js b/config/helpers/vendor_dll_hash.js index 9b99b4c4ae9..5d7feb35d36 100644 --- a/config/helpers/vendor_dll_hash.js +++ b/config/helpers/vendor_dll_hash.js @@ -1,6 +1,6 @@ -const crypto = require('crypto'); const fs = require('fs'); const path = require('path'); +const crypto = require('./patched_crypto'); const CACHE_PATHS = [ './config/webpack.config.js', @@ -11,7 +11,7 @@ const CACHE_PATHS = [ const resolvePath = (file) => path.resolve(__dirname, '../..', file); const readFile = (file) => fs.readFileSync(file); -const fileHash = (buffer) => crypto.createHash('md5').update(buffer).digest('hex'); +const fileHash = (buffer) => crypto.createHash('sha256').update(buffer).digest('hex'); module.exports = () => { const fileBuffers = CACHE_PATHS.map(resolvePath).map(readFile); diff --git a/config/initializers/0_inject_enterprise_edition_module.rb b/config/initializers/0_inject_enterprise_edition_module.rb index 41d1043af38..1951940a2a1 100644 --- a/config/initializers/0_inject_enterprise_edition_module.rb +++ b/config/initializers/0_inject_enterprise_edition_module.rb @@ -46,7 +46,7 @@ module InjectEnterpriseEditionModule end def each_extension_for(constant_name, namespace) - Gitlab.extensions.each do |extension_name| + GitlabEdition.extensions.each do |extension_name| extension_namespace = const_get_maybe_false(namespace, extension_name.upcase) diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 2587347719a..8244f570a18 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -247,6 +247,14 @@ Settings.gitlab_ci['builds_path'] = Settings.absolute(Settings.gitlab_ Settings.gitlab_ci['url'] ||= Settings.__send__(:build_gitlab_ci_url) # +# CI Secure Files +# +Settings['ci_secure_files'] ||= Settingslogic.new({}) +Settings.ci_secure_files['enabled'] = true if Settings.ci_secure_files['enabled'].nil? +Settings.ci_secure_files['storage_path'] = Settings.absolute(Settings.ci_secure_files['storage_path'] || File.join(Settings.shared['path'], "ci_secure_files")) +Settings.ci_secure_files['object_store'] = ObjectStoreSettings.legacy_parse(Settings.ci_secure_files['object_store']) + +# # Reply by email # Settings['incoming_email'] ||= Settingslogic.new({}) @@ -537,6 +545,10 @@ Settings.cron_jobs['image_ttl_group_policy_worker']['job_class'] = 'DependencyPr Settings.cron_jobs['cleanup_dependency_proxy_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['cleanup_dependency_proxy_worker']['cron'] ||= '20 3,15 * * *' Settings.cron_jobs['cleanup_dependency_proxy_worker']['job_class'] = 'DependencyProxy::CleanupDependencyProxyWorker' +Settings.cron_jobs['cleanup_package_registry_worker'] ||= Settingslogic.new({}) +Settings.cron_jobs['cleanup_package_registry_worker']['cron'] ||= '20 0,12 * * *' +Settings.cron_jobs['cleanup_package_registry_worker']['job_class'] = 'Packages::CleanupPackageRegistryWorker' + Settings.cron_jobs['x509_issuer_crl_check_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['x509_issuer_crl_check_worker']['cron'] ||= '30 1 * * *' Settings.cron_jobs['x509_issuer_crl_check_worker']['job_class'] = 'X509IssuerCrlCheckWorker' @@ -723,7 +735,7 @@ Gitlab.ee do Settings.cron_jobs['app_sec_dast_profile_schedule_worker']['cron'] ||= '7-59/15 * * * *' Settings.cron_jobs['app_sec_dast_profile_schedule_worker']['job_class'] = 'AppSec::Dast::ProfileScheduleWorker' Settings.cron_jobs['loose_foreign_keys_cleanup_worker'] ||= Settingslogic.new({}) - Settings.cron_jobs['loose_foreign_keys_cleanup_worker']['cron'] ||= '*/5 * * * *' + Settings.cron_jobs['loose_foreign_keys_cleanup_worker']['cron'] ||= '*/1 * * * *' Settings.cron_jobs['loose_foreign_keys_cleanup_worker']['job_class'] = 'LooseForeignKeys::CleanupWorker' end diff --git a/config/initializers/7_prometheus_metrics.rb b/config/initializers/7_prometheus_metrics.rb index 8ef11b83131..15757c05bd0 100644 --- a/config/initializers/7_prometheus_metrics.rb +++ b/config/initializers/7_prometheus_metrics.rb @@ -70,17 +70,17 @@ if !Rails.env.test? && Gitlab::Metrics.prometheus_metrics_enabled? Gitlab::Cluster::LifecycleEvents.on_worker_start do defined?(::Prometheus::Client.reinitialize_on_pid_change) && ::Prometheus::Client.reinitialize_on_pid_change - - Gitlab::Metrics::Samplers::RubySampler.initialize_instance.start - Gitlab::Metrics::Samplers::DatabaseSampler.initialize_instance.start - Gitlab::Metrics::Samplers::ThreadsSampler.initialize_instance.start + logger = Gitlab::AppLogger + Gitlab::Metrics::Samplers::RubySampler.initialize_instance(logger: logger).start + Gitlab::Metrics::Samplers::DatabaseSampler.initialize_instance(logger: logger).start + Gitlab::Metrics::Samplers::ThreadsSampler.initialize_instance(logger: logger).start if Gitlab::Runtime.web_server? - Gitlab::Metrics::Samplers::ActionCableSampler.instance.start + Gitlab::Metrics::Samplers::ActionCableSampler.instance(logger: logger).start end if Gitlab.ee? && Gitlab::Runtime.sidekiq? - Gitlab::Metrics::Samplers::GlobalSearchSampler.instance.start + Gitlab::Metrics::Samplers::GlobalSearchSampler.instance(logger: logger).start end Gitlab::Ci::Parsers.instrument! diff --git a/config/initializers/active_record_lifecycle.rb b/config/initializers/active_record_lifecycle.rb index 8d4b6d61abe..92cc1d81617 100644 --- a/config/initializers/active_record_lifecycle.rb +++ b/config/initializers/active_record_lifecycle.rb @@ -5,7 +5,7 @@ if defined?(ActiveRecord::Base) && !Gitlab::Runtime.sidekiq? Gitlab::Cluster::LifecycleEvents.on_worker_start do ActiveSupport.on_load(:active_record) do - ActiveRecord::Base.establish_connection + ActiveRecord::Base.establish_connection # rubocop: disable Database/EstablishConnection Gitlab::AppLogger.debug("ActiveRecord connection established") end diff --git a/config/initializers/active_record_transaction_observer.rb b/config/initializers/active_record_transaction_observer.rb index a1d4b13344e..b90b3a39ac1 100644 --- a/config/initializers/active_record_transaction_observer.rb +++ b/config/initializers/active_record_transaction_observer.rb @@ -1,18 +1,9 @@ # frozen_string_literal: true -def feature_flags_available? - # When the DBMS is not available, an exception (e.g. PG::ConnectionBad) is raised - active_db_connection = ActiveRecord::Base.connection.active? rescue false - - active_db_connection && Feature::FlipperFeature.table_exists? -rescue ActiveRecord::NoDatabaseError - false -end - return unless Gitlab.com? || Gitlab.dev_or_test_env? Gitlab::Application.configure do - if feature_flags_available? && ::Feature.enabled?(:active_record_transactions_tracking, type: :ops, default_enabled: :yaml) + if Feature.feature_flags_available? && ::Feature.enabled?(:active_record_transactions_tracking, type: :ops, default_enabled: :yaml) Gitlab::Database::Transaction::Observer.register! end end diff --git a/config/initializers/database_config.rb b/config/initializers/database_config.rb index a3172fae027..050ab1d9b3e 100644 --- a/config/initializers/database_config.rb +++ b/config/initializers/database_config.rb @@ -13,6 +13,6 @@ Gitlab.ee do # The Geo::TrackingBase model does not yet use connects_to. So, # this will not properly support geo: from config/databse.yml # file yet. This is ACK of the current state and will be fixed. - Geo::TrackingBase.establish_connection(Gitlab::Database.geo_db_config_with_default_pool_size) + Geo::TrackingBase.establish_connection(Gitlab::Database.geo_db_config_with_default_pool_size) # rubocop: disable Database/EstablishConnection end end diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index bb2e01a30f1..a7754667320 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -19,15 +19,7 @@ cookie_key = if Rails.env.development? "_gitlab_session" end -store = if Gitlab::Utils.to_boolean(ENV['GITLAB_USE_REDIS_SESSIONS_STORE'], default: true) - Gitlab::Redis::Sessions.store( - namespace: Gitlab::Redis::Sessions::SESSION_NAMESPACE - ) - else - Gitlab::Redis::SharedState.store( - namespace: Gitlab::Redis::Sessions::SESSION_NAMESPACE - ) - end +store = Gitlab::Redis::Sessions.store(namespace: Gitlab::Redis::Sessions::SESSION_NAMESPACE) Gitlab::Application.config.session_store( :redis_store, # Using the cookie_store would enable session replay attacks. diff --git a/config/initializers/sherlock.rb b/config/initializers/sherlock.rb deleted file mode 100644 index ba33ffa13c5..00000000000 --- a/config/initializers/sherlock.rb +++ /dev/null @@ -1,7 +0,0 @@ -# frozen_string_literal: true - -if Gitlab::Sherlock.enabled? - Rails.application.configure do |config| - config.middleware.use(Gitlab::Sherlock::Middleware) - end -end diff --git a/config/initializers/webhook_recursion_detection.rb b/config/initializers/webhook_recursion_detection.rb new file mode 100644 index 00000000000..b345c005bac --- /dev/null +++ b/config/initializers/webhook_recursion_detection.rb @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +Rails.application.configure do |config| + config.middleware.insert_after RequestStore::Middleware, Gitlab::Middleware::WebhookRecursionDetection +end diff --git a/config/initializers/wikicloth_disable_lua_patch.rb b/config/initializers/wikicloth_disable_lua_patch.rb new file mode 100644 index 00000000000..67d41b4327d --- /dev/null +++ b/config/initializers/wikicloth_disable_lua_patch.rb @@ -0,0 +1,31 @@ +# frozen_string_literal: true + +require 'wikicloth' +require 'wikicloth/extensions/lua' + +# Adds patch to disable lua support to eliminate vulnerability to injection attack. +# +# The maintainers are not releasing new versions, so we need to patch it here. +# +# If they ever do release a version which contains a fix for this, then we can remove this file. +# +# See: https://gitlab.com/gitlab-org/gitlab/-/issues/345892#note_751107320 + +# Guard to ensure we remember to delete this patch if they ever release a new version of wikicloth +# which disables Lua by default or otherwise eliminates all vulnerabilities mentioned in +# https://gitlab.com/gitlab-org/gitlab/-/issues/345892, including the possibility of an HTML/JS +# injection attack as mentioned in https://gitlab.com/gitlab-org/gitlab/-/issues/345892#note_751981608 +unless Gem::Version.new(WikiCloth::VERSION) == Gem::Version.new('0.8.1') + raise 'New version of WikiCloth detected, please either update the version for this check, ' \ + 'or remove this patch if no longer needed' +end + +module WikiCloth + class LuaExtension < Extension + protected + + def init_lua + @options[:disable_lua] = true + end + end +end diff --git a/config/initializers/wikicloth_patch.rb b/config/initializers/wikicloth_redos_patch.rb index 13180180c32..13180180c32 100644 --- a/config/initializers/wikicloth_patch.rb +++ b/config/initializers/wikicloth_redos_patch.rb diff --git a/config/locales/sherlock.en.yml b/config/locales/sherlock.en.yml deleted file mode 100644 index 963e1d6295a..00000000000 --- a/config/locales/sherlock.en.yml +++ /dev/null @@ -1,38 +0,0 @@ -en: - sherlock: - title: Sherlock - delete_all_transactions: Delete All Transactions - introduction: > - Below is a list of all transactions recorded by Sherlock. Requests to - Sherlock's own routes are ignored. - no_transactions: No transactions to show - no_queries: No queries to show - no_file_samples: No file samples to show - all_transactions: All Transactions - transaction: Transaction - query: Query - file_sample: File Sample - type: Type - path: Path - time: Time - queries: Queries - finished_at: Finished at - ago: ago - view: View - seconds: seconds - milliseconds: ms - general: General - id: ID - time_inclusive: Time (inclusive) - backtrace: Backtrace - application_backtrace: Application Backtrace - full_backtrace: Full Backtrace - origin: Origin - line: line - line_capitalized: Line - copy_to_clipboard: Copy - query_plan: Query Plan - events: Events - percent: '%' - count: Count - query_time: Query Time diff --git a/config/mail_room.yml b/config/mail_room.yml index 895438dcc4e..669925c2390 100644 --- a/config/mail_room.yml +++ b/config/mail_room.yml @@ -1,7 +1,7 @@ :mailboxes: <% require_relative "../lib/gitlab/mail_room" unless defined?(Gitlab::MailRoom) - Gitlab::MailRoom.enabled_configs.each do |config| + Gitlab::MailRoom.enabled_configs.each do |_key, config| %> - :host: <%= config[:host].to_json %> diff --git a/config/metrics/counts_28d/20210216175109_suggestions.yml b/config/metrics/counts_28d/20210216175109_suggestions.yml index fcccc350252..27288e43eee 100644 --- a/config/metrics/counts_28d/20210216175109_suggestions.yml +++ b/config/metrics/counts_28d/20210216175109_suggestions.yml @@ -8,7 +8,7 @@ product_stage: create product_group: group::code review product_category: code_review value_type: number -status: active +status: removed time_frame: 28d data_source: database distribution: @@ -20,3 +20,4 @@ tier: - ultimate performance_indicator_type: [] milestone: "<13.9" +milestone_removed: '14.7' diff --git a/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml b/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml index 976ffa0444a..d27548980b0 100644 --- a/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml +++ b/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml @@ -1,7 +1,7 @@ --- data_category: operational key_path: usage_activity_by_stage_monthly.verify.ci_pipeline_config_repository -description: Total Monthly Pipelines from templates in repository +description: Monthly count of unique users creating pipelines from CI files in the repository product_section: ops product_stage: verify product_group: group::pipeline execution diff --git a/config/metrics/counts_28d/20210216183640_gitlab.yml b/config/metrics/counts_28d/20210216183640_gitlab.yml index 6b074612937..9fc8a81d95f 100644 --- a/config/metrics/counts_28d/20210216183640_gitlab.yml +++ b/config/metrics/counts_28d/20210216183640_gitlab.yml @@ -1,13 +1,13 @@ --- data_category: optional key_path: usage_activity_by_stage_monthly.manage.bulk_imports.gitlab -description: DEPRECATED - Count of projects imported using bulk imports +description: REMOVED - Count of projects imported using bulk imports product_section: dev product_stage: manage product_group: group::import product_category: importers value_type: number -status: deprecated +status: removed time_frame: 28d data_source: database distribution: diff --git a/config/metrics/counts_28d/20210216183712_total.yml b/config/metrics/counts_28d/20210216183712_total.yml index 6df82786097..7d20907a88c 100644 --- a/config/metrics/counts_28d/20210216183712_total.yml +++ b/config/metrics/counts_28d/20210216183712_total.yml @@ -7,7 +7,7 @@ product_stage: manage product_group: group::import product_category: importers value_type: number -status: deprecated +status: removed time_frame: 28d data_source: database distribution: diff --git a/config/metrics/counts_28d/20210216183714_gitlab_project.yml b/config/metrics/counts_28d/20210216183714_gitlab_project.yml index 65b7f08ee9b..11397036533 100644 --- a/config/metrics/counts_28d/20210216183714_gitlab_project.yml +++ b/config/metrics/counts_28d/20210216183714_gitlab_project.yml @@ -7,7 +7,7 @@ product_stage: manage product_group: group::import product_category: importers value_type: number -status: deprecated +status: removed time_frame: 28d data_source: database distribution: diff --git a/config/metrics/counts_28d/20210216183716_gitlab.yml b/config/metrics/counts_28d/20210216183716_gitlab.yml index 78113f063ca..1f7a233360a 100644 --- a/config/metrics/counts_28d/20210216183716_gitlab.yml +++ b/config/metrics/counts_28d/20210216183716_gitlab.yml @@ -7,7 +7,7 @@ product_stage: manage product_group: group::import product_category: importers value_type: number -status: deprecated +status: removed time_frame: 28d data_source: database distribution: diff --git a/config/metrics/counts_28d/20210216183718_github.yml b/config/metrics/counts_28d/20210216183718_github.yml index caa2602d5fa..d3686ee5f13 100644 --- a/config/metrics/counts_28d/20210216183718_github.yml +++ b/config/metrics/counts_28d/20210216183718_github.yml @@ -7,7 +7,7 @@ product_stage: manage product_group: group::import product_category: importers value_type: number -status: deprecated +status: removed time_frame: 28d data_source: database distribution: diff --git a/config/metrics/counts_28d/20210216183720_bitbucket.yml b/config/metrics/counts_28d/20210216183720_bitbucket.yml index c9e54883e3f..281ddbc4179 100644 --- a/config/metrics/counts_28d/20210216183720_bitbucket.yml +++ b/config/metrics/counts_28d/20210216183720_bitbucket.yml @@ -7,7 +7,7 @@ product_stage: manage product_group: group::import product_category: importers value_type: number -status: deprecated +status: removed time_frame: 28d data_source: database distribution: diff --git a/config/metrics/counts_28d/20210216183722_bitbucket_server.yml b/config/metrics/counts_28d/20210216183722_bitbucket_server.yml index 7b81f7bf2dd..bdff1803a6a 100644 --- a/config/metrics/counts_28d/20210216183722_bitbucket_server.yml +++ b/config/metrics/counts_28d/20210216183722_bitbucket_server.yml @@ -7,7 +7,7 @@ product_stage: manage product_group: group::import product_category: importers value_type: number -status: deprecated +status: removed time_frame: 28d data_source: database distribution: diff --git a/config/metrics/counts_28d/20210216183724_gitea.yml b/config/metrics/counts_28d/20210216183724_gitea.yml index 9a8c27cae3f..eecbd276e0c 100644 --- a/config/metrics/counts_28d/20210216183724_gitea.yml +++ b/config/metrics/counts_28d/20210216183724_gitea.yml @@ -7,7 +7,7 @@ product_stage: manage product_group: group::import product_category: importers value_type: number -status: deprecated +status: removed time_frame: 28d data_source: database distribution: diff --git a/config/metrics/counts_28d/20210216183726_git.yml b/config/metrics/counts_28d/20210216183726_git.yml index b044fd6f493..e9b7a0d5e76 100644 --- a/config/metrics/counts_28d/20210216183726_git.yml +++ b/config/metrics/counts_28d/20210216183726_git.yml @@ -7,7 +7,7 @@ product_stage: manage product_group: group::import product_category: importers value_type: number -status: deprecated +status: removed time_frame: 28d data_source: database distribution: diff --git a/config/metrics/counts_28d/20210216183728_manifest.yml b/config/metrics/counts_28d/20210216183728_manifest.yml index 56d47b288f3..8cf5bb94cef 100644 --- a/config/metrics/counts_28d/20210216183728_manifest.yml +++ b/config/metrics/counts_28d/20210216183728_manifest.yml @@ -7,7 +7,7 @@ product_stage: manage product_group: group::import product_category: importers value_type: number -status: deprecated +status: removed time_frame: 28d data_source: database distribution: diff --git a/config/metrics/counts_28d/20210216183730_jira.yml b/config/metrics/counts_28d/20210216183730_jira.yml index 1a51229d107..094e46ba7f6 100644 --- a/config/metrics/counts_28d/20210216183730_jira.yml +++ b/config/metrics/counts_28d/20210216183730_jira.yml @@ -7,7 +7,7 @@ product_stage: manage product_group: group::import product_category: importers value_type: number -status: deprecated +status: removed time_frame: 28d data_source: database distribution: diff --git a/config/metrics/counts_28d/20210216183731_fogbugz.yml b/config/metrics/counts_28d/20210216183731_fogbugz.yml index 53cfec950c2..678d57b894e 100644 --- a/config/metrics/counts_28d/20210216183731_fogbugz.yml +++ b/config/metrics/counts_28d/20210216183731_fogbugz.yml @@ -7,7 +7,7 @@ product_stage: manage product_group: group::import product_category: importers value_type: number -status: deprecated +status: removed time_frame: 28d data_source: database distribution: diff --git a/config/metrics/counts_28d/20210216183733_phabricator.yml b/config/metrics/counts_28d/20210216183733_phabricator.yml index 07b95a6066c..0f3b9cc46ee 100644 --- a/config/metrics/counts_28d/20210216183733_phabricator.yml +++ b/config/metrics/counts_28d/20210216183733_phabricator.yml @@ -7,7 +7,7 @@ product_stage: manage product_group: group::import product_category: importers value_type: number -status: deprecated +status: removed time_frame: 28d data_source: database distribution: diff --git a/config/metrics/counts_28d/20210216183735_csv.yml b/config/metrics/counts_28d/20210216183735_csv.yml index afdafb3c507..e81cc094832 100644 --- a/config/metrics/counts_28d/20210216183735_csv.yml +++ b/config/metrics/counts_28d/20210216183735_csv.yml @@ -7,7 +7,7 @@ product_stage: manage product_group: group::import product_category: importers value_type: number -status: deprecated +status: removed time_frame: 28d data_source: database distribution: diff --git a/config/metrics/counts_28d/20210216183737_groups_imported.yml b/config/metrics/counts_28d/20210216183737_groups_imported.yml index 0de2e16e661..3c62a859573 100644 --- a/config/metrics/counts_28d/20210216183737_groups_imported.yml +++ b/config/metrics/counts_28d/20210216183737_groups_imported.yml @@ -7,7 +7,7 @@ product_stage: manage product_group: group::import product_category: importers value_type: number -status: deprecated +status: removed time_frame: 28d data_source: database distribution: diff --git a/config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml index dc08e248c4f..3ddc5ee355a 100644 --- a/config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml +++ b/config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml @@ -8,7 +8,7 @@ product_stage: package product_group: group::package product_category: container registry value_type: number -status: deprecated +status: removed time_frame: 28d data_source: redis_hll instrumentation_class: RedisHLLMetric diff --git a/config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml index edb282fd1a1..3de1fc2c0e8 100644 --- a/config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml +++ b/config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml @@ -8,7 +8,7 @@ product_stage: package product_group: group::package product_category: package registry value_type: number -status: deprecated +status: removed time_frame: 28d data_source: redis_hll instrumentation_class: RedisHLLMetric diff --git a/config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml index 1e3247a7109..c11dead0b06 100644 --- a/config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml +++ b/config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml @@ -8,7 +8,7 @@ product_stage: package product_group: group::package product_category: package registry value_type: number -status: deprecated +status: removed time_frame: 28d data_source: redis_hll instrumentation_class: RedisHLLMetric diff --git a/config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml index d465a6aff4b..bb6dd458ca6 100644 --- a/config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml +++ b/config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml @@ -8,7 +8,7 @@ product_stage: package product_group: group::package product_category: package registry value_type: number -status: deprecated +status: removed time_frame: 28d data_source: redis_hll instrumentation_class: RedisHLLMetric diff --git a/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml b/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml index 50df5df1b25..0e018dcd1a2 100644 --- a/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml +++ b/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml @@ -8,7 +8,7 @@ product_stage: package product_group: group::package product_category: container registry value_type: number -status: deprecated +status: removed time_frame: 28d data_source: redis_hll instrumentation_class: RedisHLLMetric diff --git a/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml b/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml index cb716aae070..03e9ec5f665 100644 --- a/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml +++ b/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml @@ -8,7 +8,7 @@ product_stage: package product_group: group::package product_category: package registry value_type: number -status: deprecated +status: removed time_frame: 28d data_source: redis_hll instrumentation_class: RedisHLLMetric diff --git a/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml b/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml index c1fcfd38e63..5f135e00214 100644 --- a/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml +++ b/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml @@ -7,7 +7,7 @@ product_stage: package product_group: group::package product_category: package registry value_type: number -status: deprecated +status: removed time_frame: 28d data_source: redis_hll instrumentation_class: RedisHLLMetric diff --git a/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml b/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml index f8d411c0348..4912d7fd40d 100644 --- a/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml +++ b/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml @@ -7,7 +7,7 @@ product_stage: package product_group: group::package product_category: package registry value_type: number -status: deprecated +status: removed time_frame: 28d data_source: redis_hll instrumentation_class: RedisHLLMetric diff --git a/config/metrics/counts_28d/20211216083832_users_clicking_license_testing_visiting_external_website_monthly.yml b/config/metrics/counts_28d/20211216083832_users_clicking_license_testing_visiting_external_website_monthly.yml new file mode 100644 index 00000000000..24f062f9a10 --- /dev/null +++ b/config/metrics/counts_28d/20211216083832_users_clicking_license_testing_visiting_external_website_monthly.yml @@ -0,0 +1,25 @@ +--- +data_category: optional +key_path: redis_hll_counters.testing.users_clicking_license_testing_visiting_external_website_monthly +description: Count of users clicking licence to visit external information website +product_section: sec +product_stage: secure +product_group: group::static analysis +product_category: dependency_scanning +value_type: number +status: active +milestone: '14.7' +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76917 +time_frame: 28d +data_source: redis_hll +instrumentation_class: RedisHLLMetric +options: + events: + - users_clicking_license_testing_visiting_external_website +distribution: + - ce + - ee +tier: + - free + - premium + - ultimate
\ No newline at end of file diff --git a/config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml index 627138b5082..4238901ee7f 100644 --- a/config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml +++ b/config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml @@ -8,7 +8,7 @@ product_stage: package product_group: group::package product_category: package registry value_type: number -status: deprecated +status: removed time_frame: 7d data_source: redis_hll instrumentation_class: RedisHLLMetric diff --git a/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml index 9fc146d3c86..5e724cef1b7 100644 --- a/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml +++ b/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml @@ -8,7 +8,7 @@ product_stage: package product_group: group::package product_category: container registry value_type: number -status: deprecated +status: removed time_frame: 7d data_source: redis_hll instrumentation_class: RedisHLLMetric diff --git a/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml index 40b86d27bca..6f190f6b4ec 100644 --- a/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml +++ b/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml @@ -8,7 +8,7 @@ product_stage: package product_group: group::package product_category: package registry value_type: number -status: deprecated +status: removed time_frame: 7d data_source: redis_hll instrumentation_class: RedisHLLMetric diff --git a/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml index 59b1aef3cb6..00103711910 100644 --- a/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml +++ b/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml @@ -8,7 +8,7 @@ product_stage: package product_group: group::package product_category: package registry value_type: number -status: deprecated +status: removed time_frame: 7d data_source: redis_hll instrumentation_class: RedisHLLMetric diff --git a/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml index e28f423b108..9b8ca1c5d7c 100644 --- a/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml +++ b/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml @@ -8,7 +8,7 @@ product_stage: package product_group: group::package product_category: package registry value_type: number -status: deprecated +status: removed time_frame: 7d data_source: redis_hll instrumentation_class: RedisHLLMetric diff --git a/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml b/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml index 313b9b9a68e..abd37cd02d6 100644 --- a/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml +++ b/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml @@ -8,7 +8,7 @@ product_stage: package product_group: group::package product_category: container registry value_type: number -status: deprecated +status: removed time_frame: 7d data_source: redis_hll instrumentation_class: RedisHLLMetric diff --git a/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml b/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml index 2d61d3fa992..29aabf7a7fa 100644 --- a/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml +++ b/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml @@ -7,7 +7,7 @@ product_stage: package product_group: group::package product_category: package registry value_type: number -status: deprecated +status: removed time_frame: 7d data_source: redis_hll instrumentation_class: RedisHLLMetric diff --git a/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml b/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml index 1ccd4d89b5b..75437f7e174 100644 --- a/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml +++ b/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml @@ -7,7 +7,7 @@ product_stage: package product_group: group::package product_category: package registry value_type: number -status: deprecated +status: removed time_frame: 7d data_source: redis_hll instrumentation_class: RedisHLLMetric diff --git a/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml b/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml index 5169e2d5519..976ca5febe1 100644 --- a/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml +++ b/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml @@ -8,7 +8,7 @@ product_stage: package product_group: group::package product_category: package registry value_type: number -status: deprecated +status: removed time_frame: 7d data_source: redis_hll instrumentation_class: RedisHLLMetric diff --git a/config/metrics/counts_7d/20211216084934_users_clicking_license_testing_visiting_external_website_weekly.yml b/config/metrics/counts_7d/20211216084934_users_clicking_license_testing_visiting_external_website_weekly.yml new file mode 100644 index 00000000000..aaa5a4f2675 --- /dev/null +++ b/config/metrics/counts_7d/20211216084934_users_clicking_license_testing_visiting_external_website_weekly.yml @@ -0,0 +1,25 @@ +--- +data_category: optional +key_path: redis_hll_counters.testing.users_clicking_license_testing_visiting_external_website_weekly +description: Count of users clicking licence to visit external information website +product_section: sec +product_stage: secure +product_group: group::static analysis +product_category: dependency_scanning +value_type: number +status: active +milestone: '14.7' +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76917 +time_frame: 7d +data_source: redis_hll +instrumentation_class: RedisHLLMetric +options: + events: + - users_clicking_license_testing_visiting_external_website +distribution: + - ce + - ee +tier: + - free + - premium + - ultimate diff --git a/config/metrics/counts_all/20210216175053_suggestions.yml b/config/metrics/counts_all/20210216175053_suggestions.yml index f09a64efc0c..774f355b02c 100644 --- a/config/metrics/counts_all/20210216175053_suggestions.yml +++ b/config/metrics/counts_all/20210216175053_suggestions.yml @@ -7,7 +7,7 @@ product_stage: create product_group: group::code review product_category: code_review value_type: number -status: active +status: removed time_frame: all data_source: database distribution: @@ -18,3 +18,4 @@ tier: - premium - ultimate milestone: "<13.9" +milestone_removed: '14.7' diff --git a/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml b/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml index cf850f26d42..2d904295d18 100644 --- a/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml +++ b/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml @@ -1,7 +1,7 @@ --- data_category: optional key_path: counts.ci_pipeline_config_repository -description: Total Pipelines from templates in repository +description: Total Pipelines from CI files in repository product_section: ops product_stage: verify product_group: group::pipeline execution diff --git a/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml b/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml index 269acb1105e..c28daf950dd 100644 --- a/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml +++ b/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml @@ -1,7 +1,7 @@ --- data_category: optional key_path: usage_activity_by_stage.verify.ci_pipeline_config_repository -description: Total Pipelines from templates in repository +description: Total count of unique users creating pipelines from CI files in the repository product_section: ops product_stage: verify product_group: group::pipeline execution diff --git a/config/metrics/counts_all/20210216180634_gitlab.yml b/config/metrics/counts_all/20210216180634_gitlab.yml index c157ae84873..491095d836e 100644 --- a/config/metrics/counts_all/20210216180634_gitlab.yml +++ b/config/metrics/counts_all/20210216180634_gitlab.yml @@ -8,7 +8,7 @@ product_stage: manage product_group: group::import product_category: importers value_type: number -status: deprecated +status: removed time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216180705_total.yml b/config/metrics/counts_all/20210216180705_total.yml index 5d76fd3873b..a159fe43199 100644 --- a/config/metrics/counts_all/20210216180705_total.yml +++ b/config/metrics/counts_all/20210216180705_total.yml @@ -7,7 +7,7 @@ product_stage: manage product_group: group::import product_category: importers value_type: number -status: deprecated +status: removed time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216180707_gitlab_project.yml b/config/metrics/counts_all/20210216180707_gitlab_project.yml index f0d513e80b3..3627fe7c13f 100644 --- a/config/metrics/counts_all/20210216180707_gitlab_project.yml +++ b/config/metrics/counts_all/20210216180707_gitlab_project.yml @@ -7,7 +7,7 @@ product_stage: manage product_group: group::import product_category: importers value_type: number -status: deprecated +status: removed time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216180709_gitlab.yml b/config/metrics/counts_all/20210216180709_gitlab.yml index ea5e3b25775..97826963cef 100644 --- a/config/metrics/counts_all/20210216180709_gitlab.yml +++ b/config/metrics/counts_all/20210216180709_gitlab.yml @@ -7,7 +7,7 @@ product_stage: manage product_group: group::import product_category: importers value_type: number -status: deprecated +status: removed time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216180711_github.yml b/config/metrics/counts_all/20210216180711_github.yml index cd3fd06d057..1df68631a35 100644 --- a/config/metrics/counts_all/20210216180711_github.yml +++ b/config/metrics/counts_all/20210216180711_github.yml @@ -7,7 +7,7 @@ product_stage: manage product_group: group::import product_category: importers value_type: number -status: deprecated +status: removed time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216180713_bitbucket.yml b/config/metrics/counts_all/20210216180713_bitbucket.yml index d0eb23fc41a..c2ad8aeb57b 100644 --- a/config/metrics/counts_all/20210216180713_bitbucket.yml +++ b/config/metrics/counts_all/20210216180713_bitbucket.yml @@ -7,7 +7,7 @@ product_stage: manage product_group: group::import product_category: importers value_type: number -status: deprecated +status: removed time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216180715_bitbucket_server.yml b/config/metrics/counts_all/20210216180715_bitbucket_server.yml index 9a3de0cb330..d588f1f48cf 100644 --- a/config/metrics/counts_all/20210216180715_bitbucket_server.yml +++ b/config/metrics/counts_all/20210216180715_bitbucket_server.yml @@ -7,7 +7,7 @@ product_stage: manage product_group: group::import product_category: importers value_type: number -status: deprecated +status: removed time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216180716_gitea.yml b/config/metrics/counts_all/20210216180716_gitea.yml index b107b213a30..7e585cd6808 100644 --- a/config/metrics/counts_all/20210216180716_gitea.yml +++ b/config/metrics/counts_all/20210216180716_gitea.yml @@ -7,7 +7,7 @@ product_stage: manage product_group: group::import product_category: importers value_type: number -status: deprecated +status: removed time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216180718_git.yml b/config/metrics/counts_all/20210216180718_git.yml index 0cd399a65ec..9e23899875a 100644 --- a/config/metrics/counts_all/20210216180718_git.yml +++ b/config/metrics/counts_all/20210216180718_git.yml @@ -7,7 +7,7 @@ product_stage: manage product_group: group::import product_category: importers value_type: number -status: deprecated +status: removed time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216180720_manifest.yml b/config/metrics/counts_all/20210216180720_manifest.yml index b91ae015f6e..07a5e2ce282 100644 --- a/config/metrics/counts_all/20210216180720_manifest.yml +++ b/config/metrics/counts_all/20210216180720_manifest.yml @@ -7,7 +7,7 @@ product_stage: manage product_group: group::import product_category: importers value_type: number -status: deprecated +status: removed time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216180722_jira.yml b/config/metrics/counts_all/20210216180722_jira.yml index 89ea9da081d..a069aa329a7 100644 --- a/config/metrics/counts_all/20210216180722_jira.yml +++ b/config/metrics/counts_all/20210216180722_jira.yml @@ -7,7 +7,7 @@ product_stage: manage product_group: group::import product_category: importers value_type: number -status: deprecated +status: removed time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216180724_fogbugz.yml b/config/metrics/counts_all/20210216180724_fogbugz.yml index e9cb3159301..ff1abeef151 100644 --- a/config/metrics/counts_all/20210216180724_fogbugz.yml +++ b/config/metrics/counts_all/20210216180724_fogbugz.yml @@ -7,7 +7,7 @@ product_stage: manage product_group: group::import product_category: importers value_type: number -status: deprecated +status: removed time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216180726_phabricator.yml b/config/metrics/counts_all/20210216180726_phabricator.yml index 933047aff58..e7de4c560bd 100644 --- a/config/metrics/counts_all/20210216180726_phabricator.yml +++ b/config/metrics/counts_all/20210216180726_phabricator.yml @@ -7,7 +7,7 @@ product_stage: manage product_group: group::import product_category: importers value_type: number -status: deprecated +status: removed time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216180727_csv.yml b/config/metrics/counts_all/20210216180727_csv.yml index e6bc3eba973..a132f2e53c1 100644 --- a/config/metrics/counts_all/20210216180727_csv.yml +++ b/config/metrics/counts_all/20210216180727_csv.yml @@ -8,7 +8,7 @@ product_stage: manage product_group: group::import product_category: importers value_type: number -status: deprecated +status: removed time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216180729_groups_imported.yml b/config/metrics/counts_all/20210216180729_groups_imported.yml index 32e968c76e2..5631a1315e6 100644 --- a/config/metrics/counts_all/20210216180729_groups_imported.yml +++ b/config/metrics/counts_all/20210216180729_groups_imported.yml @@ -7,7 +7,7 @@ product_stage: manage product_group: group::import product_category: importers value_type: number -status: deprecated +status: removed time_frame: all data_source: database distribution: diff --git a/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml b/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml index 580f06259a1..7f5dab5e1bc 100644 --- a/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml +++ b/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml @@ -7,7 +7,7 @@ product_stage: package product_group: group::package product_category: package registry value_type: number -status: deprecated +status: removed time_frame: all data_source: redis distribution: diff --git a/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml b/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml index cb399d23ed1..6cf631953f6 100644 --- a/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml +++ b/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml @@ -7,7 +7,7 @@ product_stage: package product_group: group::package product_category: package registry value_type: number -status: deprecated +status: removed time_frame: all data_source: redis distribution: diff --git a/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml b/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml index aa32883e6a5..dbd553d3ea1 100644 --- a/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml +++ b/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml @@ -7,7 +7,7 @@ product_stage: package product_group: group::package product_category: package registry value_type: number -status: deprecated +status: removed time_frame: all data_source: redis distribution: diff --git a/config/metrics/schema.json b/config/metrics/schema.json index d416c7b6d6e..09376e32ef0 100644 --- a/config/metrics/schema.json +++ b/config/metrics/schema.json @@ -30,7 +30,7 @@ }, "status": { "type": ["string"], - "enum": ["active", "deprecated", "removed", "broken"] + "enum": ["active", "removed", "broken"] }, "milestone": { "type": ["string"], diff --git a/config/metrics/settings/20211201012652_flavor.yml b/config/metrics/settings/20211201012652_flavor.yml new file mode 100644 index 00000000000..3a409424eef --- /dev/null +++ b/config/metrics/settings/20211201012652_flavor.yml @@ -0,0 +1,24 @@ +--- +key_path: database.flavor +description: What PostgreSQL flavor is being used. Possible values are + "Amazon Aurora PostgreSQL", "PostgreSQL on Amazon RDS", "Cloud SQL for PostgreSQL", + "Azure Database for PostgreSQL - Single Server", "Azure Database for PostgreSQL - Flexible Server", + or "null". +product_section: enablement +product_stage: enablement +product_group: group::database +product_category: database +value_type: string +status: active +milestone: "14.6" +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75587 +time_frame: none +data_source: system +data_category: optional +distribution: +- ce +- ee +tier: +- free +- premium +- ultimate diff --git a/config/object_store_settings.rb b/config/object_store_settings.rb index 8cbb3451a16..53fbfb088db 100644 --- a/config/object_store_settings.rb +++ b/config/object_store_settings.rb @@ -2,7 +2,7 @@ # Set default values for object_store settings class ObjectStoreSettings - SUPPORTED_TYPES = %w(artifacts external_diffs lfs uploads packages dependency_proxy terraform_state pages).freeze + SUPPORTED_TYPES = %w(artifacts external_diffs lfs uploads packages dependency_proxy terraform_state pages secure_files).freeze ALLOWED_OBJECT_STORE_OVERRIDES = %w(bucket enabled proxy_download).freeze # To ensure the one Workhorse credential matches the Rails config, we diff --git a/config/routes.rb b/config/routes.rb index b02c1380c7e..5d20d070c20 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -20,7 +20,6 @@ Rails.application.routes.draw do get 'favicon.png', to: favicon_redirect get 'favicon.ico', to: favicon_redirect - draw :sherlock draw :development use_doorkeeper do @@ -108,6 +107,9 @@ Rails.application.routes.draw do get '/autocomplete/namespace_routes' => 'autocomplete#namespace_routes' end + # sandbox + get '/sandbox/mermaid' => 'sandbox#mermaid' + get '/whats_new' => 'whats_new#index' # '/-/health' implemented by BasicHealthCheck middleware @@ -145,9 +147,6 @@ Rails.application.routes.draw do get 'acme-challenge/' => 'acme_challenges#show' - # UserCallouts - resources :user_callouts, controller: 'users/callouts', only: [:create] # remove after 14.6 2021-12-22 to handle mixed deployments - scope :ide, as: :ide, format: false do get '/', to: 'ide#index' get '/project', to: 'ide#index' diff --git a/config/routes/admin.rb b/config/routes/admin.rb index 7f19f6b8427..ed1afc9efa3 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -159,7 +159,7 @@ namespace :admin do resources :labels - resources :runners, only: [:index, :show, :update, :destroy] do + resources :runners, only: [:index, :show, :edit, :update, :destroy] do member do post :resume post :pause diff --git a/config/routes/group.rb b/config/routes/group.rb index da205163e6d..c313f7209fb 100644 --- a/config/routes/group.rb +++ b/config/routes/group.rb @@ -43,6 +43,12 @@ constraints(::Constraints::GroupUrlConstrainer.new) do post :create_deploy_token, path: 'deploy_token/create' end + resources :access_tokens, only: [:index, :create] do + member do + put :revoke + end + end + resources :integrations, only: [:index, :edit, :update] do member do put :test @@ -64,7 +70,7 @@ constraints(::Constraints::GroupUrlConstrainer.new) do post :toggle_subscription, on: :member end - resources :packages, only: [:index] + resources :packages, only: [:index, :show] resources :milestones, constraints: { id: %r{[^/]+} } do member do diff --git a/config/routes/project.rb b/config/routes/project.rb index 5f1b35d67c0..702ef64a2ca 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -212,7 +212,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do end end - resources :services, constraints: { id: %r{[^/]+} }, only: [:edit, :update] do + resources :integrations, controller: :services, constraints: { id: %r{[^/]+} }, only: [:edit, :update] do member do put :test end @@ -319,6 +319,9 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do namespace :google_cloud do resources :service_accounts, only: [:index, :create] + + get '/deployments/cloud_run', to: 'deployments#cloud_run' + get '/deployments/cloud_storage', to: 'deployments#cloud_storage' end resources :environments, except: [:destroy] do diff --git a/config/routes/sherlock.rb b/config/routes/sherlock.rb deleted file mode 100644 index a9be434dba7..00000000000 --- a/config/routes/sherlock.rb +++ /dev/null @@ -1,14 +0,0 @@ -# frozen_string_literal: true - -if Gitlab::Sherlock.enabled? - namespace :sherlock do - resources :transactions, only: [:index, :show] do - resources :queries, only: [:show] - resources :file_samples, only: [:show] - - collection do - delete :destroy_all - end - end - end -end diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index 49989e022fa..bf84527bc5f 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -73,8 +73,12 @@ - 1 - - ci_delete_objects - 1 +- - ci_job_artifacts_expire_project_build_artifacts + - 1 - - ci_upstream_projects_subscriptions_cleanup - 1 +- - cluster_agent + - 1 - - container_repository - 1 - - create_commit_signature @@ -207,6 +211,8 @@ - 1 - - incident_management_pending_escalations_issue_check - 1 +- - incident_management_pending_escalations_issue_create + - 1 - - integrations_create_external_cross_reference - 1 - - invalid_gpg_signature_update @@ -255,6 +261,8 @@ - 1 - - merge_requests_sync_code_owner_approval_rules - 1 +- - merge_requests_update_head_pipeline + - 1 - - metrics_dashboard_prune_old_annotations - 1 - - metrics_dashboard_sync_dashboards @@ -289,6 +297,8 @@ - 1 - - object_storage - 1 +- - package_cleanup + - 1 - - package_repositories - 1 - - packages_composer_cache_update diff --git a/config/webpack.config.js b/config/webpack.config.js index 7eaa11d9346..912c2fe5c45 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -1,4 +1,6 @@ -const crypto = require('crypto'); +// eslint-disable-next-line import/order +const crypto = require('./helpers/patched_crypto'); + const fs = require('fs'); const path = require('path'); @@ -141,6 +143,7 @@ function generateEntries() { sentry: './sentry/index.js', performance_bar: './performance_bar/index.js', jira_connect_app: './jira_connect/subscriptions/index.js', + sandboxed_mermaid: './lib/mermaid.js', }; return Object.assign(manualEntries, incrementalCompiler.filterEntryPoints(autoEntries)); |