Synchronize ruby3 branch manually due to conflicts
What does this MR do and why?
Synchronize ruby3
branch manually due to conflicts: https://gitlab.com/gitlab-org/gitlab/-/jobs/2991619599
It's conflicting because we dropped dependency proxy at: !96881 (merged)
Sad
We can verify that there's no actual changes via git diff ee/master..ruby3-merge
Screenshots or screen recordings
Screenshots are required for UI changes, and strongly recommended for all other merge requests.
How to set up and validate locally
Numbered steps to set up and validate the change are strongly suggested.
MR acceptance checklist
This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.
-
I have evaluated the MR acceptance checklist for this MR.
Merge request reports
Activity
assigned to @godfat-gitlab
added typemaintenance label
changed milestone to %15.4
enabled an automatic merge when the pipeline for 04cdf2b7 succeeds
- Resolved by Lin Jen-Shin
@godfat-gitlab - please see the following guidance and update this merge request.1 Warning Please add a subtype label to this merge request. If you have added a type label and do not feel the purpose of this merge request matches one of the subtypes labels, please resolve this discussion.
- A deleted user
added devopsmonitor sectionops labels
- Resolved by Lin Jen-Shin
- Resolved by Lin Jen-Shin
- Resolved by Lin Jen-Shin
3 Errors This MR has more than 20 commits. You need to rebase this branch to have fewer commits. group
is set to grouputilization in config/feature_flags/development/usage_quotas_for_all_editions.yml, which does not match groupobservability set on the MR!group
is set to groupsecurity policies in ee/config/feature_flags/development/group_level_scan_result_policies.yml, which does not match groupobservability set on the MR!7 Warnings This MR has a Changelog commit with the EE: true
trailer, but there are database changes which requires the Changelog commit to not have theEE: true
trailer. Consider removing theEE: true
trailer from your commits.This merge request is definitely too big (16732 lines changed), please split it into multiple merge requests. This merge request changed files with disabled eslint rules. Please consider fixing them. For the following files, a review from the Data team and Product Intelligence team is recommended
Please check the product intelligence Service Ping guide or the Snowplow guide.For MR review guidelines, see the Service Ping review guidelines or the Snowplow review guidelines.
config/events/1662373051_Projects__GoogleCloud__ConfigurationController_error_invalid_user.yml
config/events/1662373057_Projects__GoogleCloud__ConfigurationController_error_google_oauth2_not_enabled.yml
config/events/1662373062_Projects__GoogleCloud__ConfigurationController_error_feature_flag_not_enabled.yml
config/events/1662373069_Projects__GoogleCloud__ConfigurationController_render_page.yml
config/events/1662373075_Projects__GoogleCloud__ServiceAccountsController_error_invalid_user.yml
config/events/1662373081_Projects__GoogleCloud__ServiceAccountsController_error_google_oauth2_not_enabled.yml
config/events/1662373087_Projects__GoogleCloud__ServiceAccountsController_error_feature_flag_not_enabled.yml
config/events/1662373092_Projects__GoogleCloud__ServiceAccountsController_render_form.yml
config/events/1662373098_Projects__GoogleCloud__ServiceAccountsController_error_no_gcp_projects.yml
config/events/1662373103_Projects__GoogleCloud__ServiceAccountsController_create_service_account.yml
config/events/1662373109_Projects__GoogleCloud__ServiceAccountsController_error_google_api.yml
config/events/1662373114_Projects__GoogleCloud__GcpRegionsController_error_invalid_user.yml
config/events/1662373120_Projects__GoogleCloud__GcpRegionsController_error_google_oauth2_not_enabled.yml
config/events/1662373125_Projects__GoogleCloud__GcpRegionsController_error_feature_flag_not_enabled.yml
config/events/1662373131_Projects__GoogleCloud__GcpRegionsController_render_form.yml
config/events/1662373136_Projects__GoogleCloud__GcpRegionsController_configure_region.yml
config/events/1662373142_Projects__GoogleCloud__GcpRegionsController_error_create.yml
config/events/1662373147_Projects__GoogleCloud__RevokeOauthController_error_invalid_user.yml
config/events/1662373153_Projects__GoogleCloud__RevokeOauthController_error_google_oauth2_not_enabled.yml
config/events/1662373158_Projects__GoogleCloud__RevokeOauthController_error_feature_flag_not_enabled.yml
config/events/1662373164_Projects__GoogleCloud__RevokeOauthController_revoke_oauth.yml
config/events/1662373170_Projects__GoogleCloud__DeploymentsController_error_invalid_user.yml
config/events/1662373175_Projects__GoogleCloud__DeploymentsController_error_google_oauth2_not_enabled.yml
config/events/1662373181_Projects__GoogleCloud__DeploymentsController_error_feature_flag_not_enabled.yml
config/events/1662373187_Projects__GoogleCloud__DeploymentsController_render_page.yml
config/events/1662373192_Projects__GoogleCloud__DeploymentsController_generate_cloudrun_pipeline.yml
config/events/1662373198_Projects__GoogleCloud__DeploymentsController_error_enable_cloudrun_services.yml
config/events/1662373204_Projects__GoogleCloud__DeploymentsController_error_generate_cloudrun_pipeline.yml
config/events/1662373209_Projects__GoogleCloud__DeploymentsController_error_google_api.yml
config/events/1662373215_Projects__GoogleCloud__DatabasesController_error_invalid_user.yml
config/events/1662373220_Projects__GoogleCloud__DatabasesController_error_google_oauth2_not_enabled.yml
config/events/1662373226_Projects__GoogleCloud__DatabasesController_error_feature_flag_not_enabled.yml
config/events/1662373232_Projects__GoogleCloud__DatabasesController_render_page.yml
config/events/1662373237_Projects__GoogleCloud__DatabasesController_render_cloudsql_form.yml
config/events/1662373243_Projects__GoogleCloud__DatabasesController_create_cloudsql_instance.yml
config/events/1662373249_Projects__GoogleCloud__DatabasesController_error_enable_cloudsql_services.yml
config/events/1662373254_Projects__GoogleCloud__DatabasesController_error_create_cloudsql_instance.yml
config/metrics/counts_28d/20220531145023_p_ci_templates_katalon_monthly.yml
config/metrics/counts_7d/20220531145014_p_ci_templates_katalon_weekly.yml
config/metrics/counts_all/20220825232556_count_user_auth.yml
lib/gitlab/usage/metrics/instrumentations/count_user_auth_metric.rb
spec/lib/gitlab/usage/metrics/instrumentations/count_user_auth_metric_spec.rb
config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
config/metrics/counts_all/20210216182006_source_code_pushes.yml
lib/gitlab/usage/metrics/instrumentations/redis_metric.rb
lib/gitlab/usage_data_counters/known_events/ci_templates.yml
lib/gitlab/usage_data_counters/known_events/code_review_events.yml
lib/gitlab/usage_data_counters/hll_redis_counter.rb
spec/lib/gitlab/usage/metrics/instrumentations/redis_metric_spec.rb
spec/lib/gitlab/usage_data_spec.rb
config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_commit_monthly.yml
config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_monthly.yml
config/metrics/counts_28d/20220504150641_count_notes_in_ipynb_diff_mr_monthly.yml
config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_commit_monthly.yml
config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_monthly.yml
config/metrics/counts_28d/20220504150641_count_users_with_notes_in_ipynb_diff_mr_monthly.yml
config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_commit_weekly.yml
config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_mr_weekly.yml
config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_weekly.yml
config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_commit_weekly.yml
config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_mr_weekly.yml
config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_weekly.yml
Do not add new controller specs. We are moving from controller specs to
request specs (and/or feature specs). Please add request specs under
/spec/requests
and/or/ee/spec/requests
instead.See &5076 for information.
Please add a merge request subtype to this merge request. Most of the time, merge requests should target master
. Otherwise, please set the relevantPick into X.Y
label.3 Messages This merge request adds or changes files that require a review from the CI/CD Templates maintainers. This merge request adds or changes files that require a review from the Database team. This merge request adds or changes documentation files. A review from the Technical Writing team before you merge is recommended. Reviews can happen after you merge. This merge request requires a CI/CD Template review. To make sure these changes are reviewed, take the following steps:
- Ensure the merge request has the citemplates label. If the merge request modifies CI/CD Template files, Danger will do this for you.
- Prepare your MR for a CI/CD Template review according to the template development guide.
- Assign and
@
mention the CI/CD Template reviewer suggested by Reviewer Roulette.
The following files require a review from the CI/CD Templates maintainers:
lib/gitlab/ci/templates/Katalon.gitlab-ci.yml
This merge request requires a database review. To make sure these changes are reviewed, take the following steps:
-
Ensure the merge request has database and databasereview pending labels. If the merge request modifies database files, Danger will do this for you.
-
Prepare your MR for database review according to the docs.
-
Assign and mention the database reviewer suggested by Reviewer Roulette.
-
If this is not a Community contribution or from a Fork, kick off the
db:gitlabcom-database-testing
manual job.
The following files require a review from the Database team:
db/migrate/20220603125200_add_show_diff_preview_in_email_to_namespace_settings.rb
db/migrate/20220817122907_re_add_show_diff_preview_in_email_to_project_settings.rb
db/migrate/20220818132108_add_deleted_on_to_ml_experiments.rb
db/migrate/20220902065314_create_ci_partitions.rb
db/migrate/20220902065316_create_default_partition_record.rb
db/migrate/20220902065317_add_partition_id_to_ci_builds.rb
db/migrate/20220902065558_add_partition_id_to_ci_builds_metadata.rb
db/migrate/20220902065611_add_partition_id_to_ci_job_artifacts.rb
db/migrate/20220902065623_add_partition_id_to_ci_pipelines.rb
db/migrate/20220902065635_add_partition_id_to_ci_stages.rb
db/migrate/20220902065647_add_partition_id_to_ci_pipeline_variables.rb
db/post_migrate/20220902204048_move_security_findings_table_to_gitlab_partitions_dynamic_schema.rb
db/post_migrate/20220905112710_add_async_index_to_todos_to_cover_pending_query.rb
db/schema_migrations/20220603125200
db/schema_migrations/20220817122907
db/schema_migrations/20220818132108
db/schema_migrations/20220902065314
db/schema_migrations/20220902065316
db/schema_migrations/20220902065317
db/schema_migrations/20220902065558
db/schema_migrations/20220902065611
db/schema_migrations/20220902065623
db/schema_migrations/20220902065635
db/schema_migrations/20220902065647
db/schema_migrations/20220902204048
db/schema_migrations/20220905112710
spec/migrations/move_security_findings_table_to_gitlab_partitions_dynamic_schema_spec.rb
app/finders/issues_finder.rb
app/finders/projects_finder.rb
db/structure.sql
ee/app/finders/approval_rules/group_finder.rb
ee/app/finders/billed_users_finder.rb
lib/gitlab/database/partitioning/partition_manager.rb
lib/gitlab/database/partitioning/single_numeric_list_partition.rb
lib/gitlab/database/partitioning_migration_helpers/index_helpers.rb
lib/gitlab/database/gitlab_schemas.yml
lib/gitlab/database/tables_truncate.rb
db/post_migrate/20220901035725_schedule_destroy_invalid_project_members.rb
Notification to the Data Team about changes to files with possible impact on Data Warehouse, add label
Data Warehouse::Impact Check
.The following files require a review:
db/structure.sql
Documentation review
The following files require a review from a technical writer:
db/docs/ci_partitions.yml
doc/ci/mobile_devops.md
doc/install/migrate/compare_sm_to_saas.md
doc/operations/incident_management/incident_timeline_events.md
doc/user/discussions/img/create_new_issue_v15_4.png
doc/user/discussions/img/unresolved_threads_v15_4.png
doc/administration/geo/secondary_proxy/index.md
doc/administration/monitoring/prometheus/index.md
doc/administration/audit_event_streaming.md
doc/administration/inactive_project_deletion.md
doc/administration/repository_checks.md
doc/administration/server_hooks.md
doc/administration/user_settings.md
doc/api/graphql/reference/index.md
doc/api/releases/index.md
doc/api/group_repository_storage_moves.md
doc/api/groups.md
doc/api/job_artifacts.md
doc/api/jobs.md
doc/api/members.md
doc/api/merge_requests.md
doc/api/pipelines.md
doc/api/settings.md
doc/api/topics.md
doc/architecture/blueprints/ci_data_decay/pipeline_partitioning.md
doc/ci/cloud_deployment/ecs/deploy_to_aws_ecs.md
doc/ci/examples/php.md
doc/ci/jobs/ci_job_token.md
doc/ci/jobs/job_control.md
doc/ci/migration/circleci.md
doc/ci/migration/jenkins.md
doc/ci/pipelines/downstream_pipelines.md
doc/ci/pipelines/index.md
doc/ci/pipelines/job_artifacts.md
doc/ci/pipelines/merge_trains.md
doc/ci/pipelines/merged_results_pipelines.md
doc/ci/pipelines/parent_child_pipelines.md
doc/ci/pipelines/pipeline_architectures.md
doc/ci/pipelines/pipeline_efficiency.md
doc/ci/quick_start/index.md
doc/ci/resource_groups/index.md
doc/ci/yaml/index.md
doc/ci/yaml/script.md
doc/ci/troubleshooting.md
doc/cloud_seed/index.md
doc/development/database/add_foreign_key_to_existing_column.md
doc/development/database/not_null_constraints.md
doc/development/documentation/site_architecture/deployment_process.md
doc/development/documentation/testing.md
doc/development/packages/new_format_development.md
doc/development/service_ping/implement.md
doc/development/service_ping/metrics_instrumentation.md
doc/development/code_review.md
doc/development/ruby3_gotchas.md
doc/development/secure_coding_guidelines.md
doc/integration/jira/issues.md
doc/integration/kerberos.md
doc/operations/incident_management/incidents.md
doc/operations/incident_management/linked_resources.md
doc/topics/build_your_application.md
doc/update/deprecations.md
doc/update/index.md
doc/user/application_security/coverage_fuzzing/index.md
doc/user/application_security/dast/index.md
doc/user/application_security/policies/scan-execution-policies.md
doc/user/application_security/get-started-security.md
doc/user/discussions/index.md
doc/user/packages/composer_repository/index.md
doc/user/packages/conan_repository/index.md
doc/user/packages/container_registry/index.md
doc/user/packages/container_registry/reduce_container_registry_storage.md
doc/user/packages/dependency_proxy/index.md
doc/user/packages/dependency_proxy/reduce_dependency_proxy_storage.md
doc/user/packages/generic_packages/index.md
doc/user/packages/infrastructure_registry/index.md
doc/user/packages/maven_repository/index.md
doc/user/packages/npm_registry/index.md
doc/user/packages/package_registry/index.md
doc/user/packages/package_registry/reduce_package_registry_storage.md
doc/user/packages/pypi_repository/index.md
doc/user/packages/rubygems_registry/index.md
doc/user/project/integrations/hangouts_chat.md
doc/user/project/issues/associate_zoom_meeting.md
doc/user/project/merge_requests/approvals/rules.md
doc/user/project/merge_requests/approvals/settings.md
doc/user/project/merge_requests/methods/index.md
doc/user/project/merge_requests/commit_templates.md
doc/user/project/merge_requests/merge_when_pipeline_succeeds.md
doc/user/project/merge_requests/squash_and_merge.md
doc/user/project/merge_requests/status_checks.md
doc/user/project/settings/index.md
doc/user/project/description_templates.md
doc/user/project/quick_actions.md
doc/user/project/service_desk.md
doc/user/markdown.md
doc/user/permissions.md
The review does not need to block merging this merge request. See the:
-
Metadata for the
*.md
files that you've changed. The first few lines of each*.md
file identify the stage and group most closely associated with your docs change. - The Technical Writer assigned for that stage and group.
- Documentation workflows for information on when to assign a merge request for review.
Disabled eslint rules
The following files have disabled
eslint
rules. Please consider fixing them:app/assets/javascripts/boards/stores/mutations.js
app/assets/javascripts/design_management/pages/design/index.vue
app/assets/javascripts/issuable/issuable_form.js
app/assets/javascripts/vue_merge_request_widget/components/extensions/base.vue
ee/app/assets/javascripts/codequality_report/codequality_report.vue
ee/app/assets/javascripts/codequality_report/codequality_report_graphql.vue
ee/app/assets/javascripts/pages/projects/edit/index.js
ee/app/assets/javascripts/related_items_tree/components/related_items_tree_app.vue
ee/app/assets/javascripts/security_dashboard/components/pipeline/pipeline_security_dashboard.vue
Run the following command for more details
node_modules/.bin/eslint --report-unused-disable-directives --no-inline-config \ 'app/assets/javascripts/boards/stores/mutations.js' \ 'app/assets/javascripts/design_management/pages/design/index.vue' \ 'app/assets/javascripts/issuable/issuable_form.js' \ 'app/assets/javascripts/vue_merge_request_widget/components/extensions/base.vue' \ 'ee/app/assets/javascripts/codequality_report/codequality_report.vue' \ 'ee/app/assets/javascripts/codequality_report/codequality_report_graphql.vue' \ 'ee/app/assets/javascripts/pages/projects/edit/index.js' \ 'ee/app/assets/javascripts/related_items_tree/components/related_items_tree_app.vue' \ 'ee/app/assets/javascripts/security_dashboard/components/pipeline/pipeline_security_dashboard.vue'
Pipeline Changes
This merge request contains changes to the pipeline configuration for the GitLab project.
Please consider the effect of the changes in this merge request on the following:
- Effects on different pipeline types
- Effects on non-canonical projects:
gitlab-foss
security
dev
- personal forks
- Effects on pipeline performance
Please consider communicating these changes to the broader team following the communication guideline for pipeline changes
Reviewer roulette
Changes that require review have been detected!
Please refer to the table below for assigning reviewers and maintainers suggested by Danger in the specified category:
Category Reviewer Maintainer backend John Mason ( @john-mason
) (UTC-4, 4 hours behind@godfat-gitlab
)Sincheol (David) Kim ( @dskim_gitlab
) (UTC+9.5, 9.5 hours ahead of@godfat-gitlab
)citemplates Brian Williams ( @bwill
) (UTC-5, 5 hours behind@godfat-gitlab
)Marcel Amirault ( @marcel.amirault
) (UTC+9, 9 hours ahead of@godfat-gitlab
)database Max Woolf ( @mwoolf
) (UTC+1, 1 hour ahead of@godfat-gitlab
)Alex Ives ( @alexives
) (UTC-5, 5 hours behind@godfat-gitlab
)frontend Deepika Guliani ( @deepika.guliani
) (UTC+5.5, 5.5 hours ahead of@godfat-gitlab
)Savas Vedova ( @svedova
) (UTC+2, 2 hours ahead of@godfat-gitlab
)~"group::integrations" (frontend) Justin Ho ( @justin_ho
) (UTC+7, 7 hours ahead of@godfat-gitlab
)Maintainer review is optional for ~"group::integrations" (frontend) ~"migration" No reviewer available No maintainer available product intelligence Mikołaj Wawrzyniak ( @mikolaj_wawrzyniak
) (UTC+2, 2 hours ahead of@godfat-gitlab
)Maintainer review is optional for product intelligence QA Carlo Catimbang ( @carlocatimbang
) (UTC+8, 8 hours ahead of@godfat-gitlab
)Maintainer review is optional for QA test for spec/features/*
John Mason ( @john-mason
) (UTC-4, 4 hours behind@godfat-gitlab
)Maintainer review is optional for test for spec/features/*
maintenanceworkflow / maintenancepipelines for CI, Danger Amparo Luna ( @a_luna
) (UTC-5, 5 hours behind@godfat-gitlab
)Sincheol (David) Kim ( @dskim_gitlab
) (UTC+9.5, 9.5 hours ahead of@godfat-gitlab
)workhorse Steve Azzopardi ( @steveazz
) (UTC+2, 2 hours ahead of@godfat-gitlab
)Jacob Vosmaer ( @jacobvosmaer-gitlab
) (UTC+2, 2 hours ahead of@godfat-gitlab
)To spread load more evenly across eligible reviewers, Danger has picked a candidate for each review slot, based on their timezone. Feel free to override these selections if you think someone else would be better-suited or use the GitLab Review Workload Dashboard to find other available reviewers.
To read more on how to use the reviewer roulette, please take a look at the Engineering workflow and code review guidelines. Please consider assigning a reviewer or maintainer who is a domain expert in the area of the merge request.
Once you've decided who will review this merge request, assign them as a reviewer! Danger does not automatically notify them for you.
Uncategorized files
These files couldn't be categorized, so Danger was unable to suggest a reviewer. Please consider creating a merge request to add support for them.
.markdownlint.yml
If needed, you can retry the
danger-review
job that generated this comment.Generated by
Danger
removed ~20757942 QA backend ~16636198 database databasereview pending feature flag frontend groupobservability sectionops labels
added sectionops label
removed sectionops label
added maintenancepipelines label
Allure report
allure-report-publisher
generated test report!e2e-review-qa-blocking:
test report for 7d62dbbdexpand test summary
+-----------------------------------------------------------------------------------------+ | suites summary | +------------------------------------+--------+--------+---------+-------+-------+--------+ | | passed | failed | skipped | flaky | total | result | +------------------------------------+--------+--------+---------+-------+-------+--------+ | Create | 28 | 0 | 1 | 26 | 29 | ❗ | | Plan | 47 | 0 | 1 | 46 | 48 | ❗ | | Feature flag handler sanity checks | 9 | 0 | 0 | 0 | 9 | ✅ | | Protect | 2 | 0 | 0 | 2 | 2 | ❗ | | Manage | 57 | 0 | 3 | 57 | 60 | ❗ | | Verify | 12 | 0 | 1 | 11 | 13 | ❗ | | Package | 0 | 0 | 1 | 0 | 1 | ➖ | | Configure | 0 | 0 | 1 | 0 | 1 | ➖ | | Version sanity check | 0 | 0 | 1 | 0 | 1 | ➖ | | Secure | 2 | 0 | 0 | 2 | 2 | ❗ | +------------------------------------+--------+--------+---------+-------+-------+--------+ | Total | 157 | 0 | 9 | 144 | 166 | ❗ | +------------------------------------+--------+--------+---------+-------+-------+--------+
e2e-package-and-test:
test report for 7d62dbbdexpand test summary
+---------------------------------------------------------------------------+ | suites summary | +----------------------+--------+--------+---------+-------+-------+--------+ | | passed | failed | skipped | flaky | total | result | +----------------------+--------+--------+---------+-------+-------+--------+ | Manage | 609 | 1 | 24 | 7 | 634 | ❌ | | Create | 969 | 0 | 30 | 12 | 999 | ❗ | | Plan | 350 | 0 | 0 | 0 | 350 | ✅ | | Verify | 260 | 0 | 48 | 8 | 308 | ❗ | | Fulfillment | 13 | 1 | 67 | 1 | 81 | ❌ | | Secure | 126 | 0 | 12 | 0 | 138 | ✅ | | Analytics | 13 | 0 | 0 | 0 | 13 | ✅ | | Package | 161 | 0 | 36 | 1 | 197 | ❗ | | Configure | 1 | 0 | 18 | 0 | 19 | ✅ | | Protect | 12 | 0 | 0 | 0 | 12 | ✅ | | Version sanity check | 0 | 0 | 6 | 0 | 6 | ➖ | | Release | 24 | 0 | 0 | 0 | 24 | ✅ | | Systems | 19 | 0 | 0 | 0 | 19 | ✅ | | GitLab Metrics | 2 | 0 | 1 | 0 | 3 | ✅ | +----------------------+--------+--------+---------+-------+-------+--------+ | Total | 2559 | 2 | 242 | 29 | 2803 | ❌ | +----------------------+--------+--------+---------+-------+-------+--------+