From ed509186782d16d2bbcb34ac73303e8cb3a9d5a2 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 2 Nov 2022 12:11:04 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .rubocop_todo/style/case_like_if.yml | 63 -------------- .../style/redundant_interpolation.yml | 79 ------------------ .../diffs/components/diff_discussions.vue | 1 + .../notes/components/discussion_notes.vue | 7 ++ .../notes/components/noteable_discussion.vue | 6 ++ .../notes/components/noteable_note.vue | 7 +- .../labels_select_widget/label_item.vue | 2 +- app/controllers/concerns/issuable_actions.rb | 5 +- .../application_controller.rb | 5 +- .../oauth/authorizations_controller.rb | 17 +++- app/controllers/projects/issues_controller.rb | 1 + app/controllers/projects/labels_controller.rb | 5 +- app/graphql/types/ci/job_need_union.rb | 5 +- app/helpers/application_settings_helper.rb | 1 + app/helpers/avatars_helper.rb | 5 +- app/helpers/broadcast_messages_helper.rb | 5 +- app/helpers/issues_helper.rb | 5 +- .../routing/pseudonymization_helper.rb | 7 +- app/helpers/todos_helper.rb | 5 +- app/models/application_setting.rb | 3 + .../application_setting_implementation.rb | 1 + app/models/integrations/jira.rb | 5 +- app/models/members/member_task.rb | 5 +- app/models/namespace.rb | 7 +- app/models/packages/go/module_version.rb | 5 +- app/models/work_items/type.rb | 11 ++- app/serializers/group_child_serializer.rb | 5 +- .../google_cloud/generate_pipeline_service.rb | 5 +- app/services/issuable/bulk_update_service.rb | 5 +- app/services/todo_service.rb | 7 +- .../user_project_access_changed_service.rb | 5 +- .../authorizations/forbidden.html.haml | 5 ++ .../development/work_items_mvc.yml | 8 ++ ...13103738_add_disable_admin_oauth_scopes.rb | 7 ++ ...ective_and_keyresult_to_work_item_types.rb | 56 +++++++++++++ db/schema_migrations/20221013103738 | 1 + db/schema_migrations/20221018050323 | 1 + db/structure.sql | 1 + doc/administration/gitaly/index.md | 3 - doc/api/settings.md | 1 + doc/architecture/blueprints/pods/index.md | 55 +++++++++++- .../blueprints/pods/pods-and-fulfillment.png | Bin 0 -> 75803 bytes doc/drawers/advanced_search_syntax.md | 45 +++++----- .../elasticsearch_troubleshooting.md | 4 +- doc/user/project/integrations/webhooks.md | 10 ++- doc/user/search/advanced_search.md | 38 ++++++++- .../global_search/advanced_search_syntax.md | 55 ++---------- lib/api/helpers/label_helpers.rb | 5 +- lib/api/settings.rb | 1 + lib/gitlab/ci/ansi2html.rb | 5 +- lib/gitlab/ci/ansi2json/converter.rb | 5 +- lib/gitlab/ci/build/image.rb | 5 +- lib/gitlab/identifier.rb | 5 +- lib/gitlab/issues/rebalancing/state.rb | 5 +- lib/gitlab/pagination/gitaly_keyset_pager.rb | 14 ++-- .../duplicate_jobs/duplicate_job.rb | 1 + lib/gitlab/utils.rb | 10 ++- lib/gitlab/utils/strong_memoize.rb | 5 +- locale/gitlab.pot | 6 ++ qa/qa/git/repository.rb | 5 +- qa/qa/scenario/bootable.rb | 5 +- .../admin/integrations_controller_spec.rb | 2 +- .../oauth/authorizations_controller_spec.rb | 69 +++++++++++++++ .../projects/issues_controller_spec.rb | 18 ++++ .../boards/user_adds_lists_to_board_spec.rb | 5 +- spec/features/commits_spec.rb | 4 +- spec/features/issues/user_edits_issue_spec.rb | 4 +- .../user_scrolls_to_note_on_load_spec.rb | 2 +- spec/features/one_trust_spec.rb | 2 +- ...ith_external_authorization_enabled_spec.rb | 8 +- .../projects/jobs/user_browses_jobs_spec.rb | 6 +- .../__snapshots__/notes_app_spec.js.snap | 4 +- .../container_repositories_resolver_spec.rb | 4 +- spec/graphql/types/issue_type_enum_spec.rb | 2 +- spec/helpers/environments_helper_spec.rb | 2 +- spec/helpers/integrations_helper_spec.rb | 2 +- spec/helpers/snippets_helper_spec.rb | 4 +- .../packages/dependency_proxy_helpers_spec.rb | 2 +- .../validations/validators/git_ref_spec.rb | 2 +- .../api/validations/validators/limit_spec.rb | 4 +- spec/lib/backup/database_backup_error_spec.rb | 8 +- spec/lib/backup/file_backup_error_spec.rb | 4 +- .../lib/banzai/filter/autolink_filter_spec.rb | 2 +- ...ssuable_reference_expansion_filter_spec.rb | 2 +- .../references/alert_reference_filter_spec.rb | 2 +- .../commit_reference_filter_spec.rb | 2 +- .../references/issue_reference_filter_spec.rb | 4 +- .../references/label_reference_filter_spec.rb | 10 +-- .../milestone_reference_filter_spec.rb | 10 +-- .../project_reference_filter_spec.rb | 4 +- .../references/user_reference_filter_spec.rb | 2 +- spec/lib/feature_spec.rb | 8 +- spec/lib/gitlab/auth/auth_finders_spec.rb | 5 +- .../legacy_upload_mover_spec.rb | 2 +- .../populate_vulnerability_reads_spec.rb | 2 +- spec/lib/gitlab/ci/config/entry/job_spec.rb | 2 +- .../ci/config/entry/processable_spec.rb | 2 +- spec/lib/gitlab/ci/reports/test_suite_spec.rb | 2 +- spec/lib/gitlab/database/batch_count_spec.rb | 2 +- .../load_balancing/connection_proxy_spec.rb | 4 +- .../gitlab/database/load_balancing_spec.rb | 5 +- .../import_export/group/tree_saver_spec.rb | 2 +- ..._projects_deletion_warning_tracker_spec.rb | 4 +- spec/lib/gitlab/metrics/dashboard/url_spec.rb | 2 +- .../pagination/gitaly_keyset_pager_spec.rb | 2 +- spec/lib/gitlab/redis/multi_store_spec.rb | 4 +- spec/lib/grafana/client_spec.rb | 2 +- spec/lib/omni_auth/strategies/jwt_spec.rb | 2 + spec/mailers/notify_spec.rb | 2 +- ...64845_populate_vulnerability_reads_spec.rb | 2 +- ...e_and_keyresult_to_work_item_types_spec.rb | 66 +++++++++++++++ spec/models/active_session_spec.rb | 2 +- .../clusters/platforms/kubernetes_spec.rb | 2 +- spec/models/concerns/sha_attribute_spec.rb | 10 ++- spec/models/diff_discussion_spec.rb | 2 +- spec/models/namespace_spec.rb | 2 +- .../preloaders/labels_preloader_spec.rb | 5 +- spec/models/work_items/type_spec.rb | 4 +- spec/presenters/project_presenter_spec.rb | 8 +- spec/rack_servers/configs/config.ru | 2 +- .../api/alert_management_alerts_spec.rb | 8 +- spec/requests/api/markdown_spec.rb | 2 +- spec/requests/api/merge_requests_spec.rb | 2 +- .../api/metrics/dashboard/annotations_spec.rb | 2 +- .../api/personal_access_tokens_spec.rb | 5 +- spec/requests/api/rubygem_packages_spec.rb | 5 +- spec/requests/api/tags_spec.rb | 2 +- .../api/terraform/modules/v1/packages_spec.rb | 5 +- spec/requests/api/terraform/state_spec.rb | 4 +- .../deployments_controller_spec.rb | 6 +- .../service_accounts_controller_spec.rb | 2 +- spec/routing/project_routing_spec.rb | 4 +- .../atomic_processing_service_spec.rb | 5 +- ..._or_update_service_account_service_spec.rb | 2 +- spec/services/groups/transfer_service_spec.rb | 4 +- spec/services/members/invite_service_spec.rb | 4 +- .../change_state_service_spec.rb | 10 ++- spec/services/todo_service_spec.rb | 2 +- .../destroy/entity_leave_service_spec.rb | 2 +- spec/services/users/approve_service_spec.rb | 2 +- spec/services/users/ban_service_spec.rb | 2 +- spec/services/users/reject_service_spec.rb | 2 +- spec/services/users/unban_service_spec.rb | 2 +- .../google_api/cloud_platform_helpers.rb | 2 +- .../helpers/features/releases_helpers.rb | 2 +- spec/support/helpers/filter_spec_helper.rb | 5 +- spec/support/helpers/graphql_helpers.rb | 2 +- spec/support/helpers/kubernetes_helpers.rb | 2 +- spec/support/matchers/exceed_query_limit.rb | 2 +- .../graphql/notes_creation_shared_examples.rb | 2 +- .../packages_resolvers_shared_examples.rb | 4 +- .../mailers/notify_shared_examples.rb | 4 +- ...ctive_record_subscriber_shared_examples.rb | 5 +- ...d_project_packages_list_shared_examples.rb | 2 +- .../requests/api/issues_shared_examples.rb | 2 +- .../requests/api/notes_shared_examples.rb | 7 +- ...ss_user_callout_service_shared_examples.rb | 2 +- .../object_storage_shared_examples.rb | 5 +- spec/support_specs/graphql/arguments_spec.rb | 4 +- .../commit/_commit_box.html.haml_spec.rb | 2 +- .../loose_foreign_keys/cleanup_worker_spec.rb | 5 +- 161 files changed, 699 insertions(+), 461 deletions(-) delete mode 100644 .rubocop_todo/style/case_like_if.yml create mode 100644 app/views/doorkeeper/authorizations/forbidden.html.haml create mode 100644 config/feature_flags/development/work_items_mvc.yml create mode 100644 db/migrate/20221013103738_add_disable_admin_oauth_scopes.rb create mode 100644 db/migrate/20221018050323_add_objective_and_keyresult_to_work_item_types.rb create mode 100644 db/schema_migrations/20221013103738 create mode 100644 db/schema_migrations/20221018050323 create mode 100644 doc/architecture/blueprints/pods/pods-and-fulfillment.png create mode 100644 spec/migrations/20221018050323_add_objective_and_keyresult_to_work_item_types_spec.rb diff --git a/.rubocop_todo/style/case_like_if.yml b/.rubocop_todo/style/case_like_if.yml deleted file mode 100644 index 61f2e6bc238..00000000000 --- a/.rubocop_todo/style/case_like_if.yml +++ /dev/null @@ -1,63 +0,0 @@ ---- -# Cop supports --auto-correct. -Style/CaseLikeIf: - Details: grace period - Exclude: - - 'app/controllers/concerns/issuable_actions.rb' - - 'app/controllers/groups/dependency_proxy/application_controller.rb' - - 'app/controllers/projects/labels_controller.rb' - - 'app/graphql/types/ci/job_need_union.rb' - - 'app/helpers/avatars_helper.rb' - - 'app/helpers/broadcast_messages_helper.rb' - - 'app/helpers/issues_helper.rb' - - 'app/helpers/routing/pseudonymization_helper.rb' - - 'app/helpers/todos_helper.rb' - - 'app/models/integrations/jira.rb' - - 'app/models/members/member_task.rb' - - 'app/models/namespace.rb' - - 'app/models/packages/go/module_version.rb' - - 'app/serializers/group_child_serializer.rb' - - 'app/services/google_cloud/generate_pipeline_service.rb' - - 'app/services/issuable/bulk_update_service.rb' - - 'app/services/todo_service.rb' - - 'app/services/user_project_access_changed_service.rb' - - 'ee/app/controllers/concerns/credentials_inventory_actions.rb' - - 'ee/app/finders/ee/notes_finder.rb' - - 'ee/app/finders/security/scan_execution_policies_finder.rb' - - 'ee/app/finders/security/training_providers/secure_code_warrior_url_finder.rb' - - 'ee/app/helpers/ee/branches_helper.rb' - - 'ee/app/services/epics/tree_reorder_service.rb' - - 'ee/app/services/merge_request_approval_settings/update_service.rb' - - 'ee/lib/gitlab/alert_management/alert_payload_field_extractor.rb' - - 'ee/spec/config/metrics/every_metric_definition_spec.rb' - - 'ee/spec/features/boards/user_adds_lists_to_board_spec.rb' - - 'ee/spec/features/issues/user_bulk_edits_issues_spec.rb' - - 'ee/spec/features/projects/custom_projects_template_spec.rb' - - 'ee/spec/support/matchers/ee/epic_aggregate_matchers.rb' - - 'lib/api/helpers/label_helpers.rb' - - 'lib/gitlab/ci/ansi2html.rb' - - 'lib/gitlab/ci/ansi2json/converter.rb' - - 'lib/gitlab/ci/build/image.rb' - - 'lib/gitlab/identifier.rb' - - 'lib/gitlab/issues/rebalancing/state.rb' - - 'lib/gitlab/pagination/gitaly_keyset_pager.rb' - - 'lib/gitlab/utils.rb' - - 'lib/gitlab/utils/strong_memoize.rb' - - 'qa/qa/git/repository.rb' - - 'qa/qa/scenario/bootable.rb' - - 'spec/features/boards/user_adds_lists_to_board_spec.rb' - - 'spec/lib/gitlab/auth/auth_finders_spec.rb' - - 'spec/lib/gitlab/database/load_balancing_spec.rb' - - 'spec/lib/omni_auth/strategies/jwt_spec.rb' - - 'spec/models/concerns/sha_attribute_spec.rb' - - 'spec/models/preloaders/labels_preloader_spec.rb' - - 'spec/requests/api/personal_access_tokens_spec.rb' - - 'spec/requests/api/rubygem_packages_spec.rb' - - 'spec/requests/api/terraform/modules/v1/packages_spec.rb' - - 'spec/services/ci/pipeline_processing/atomic_processing_service_spec.rb' - - 'spec/services/resource_events/change_state_service_spec.rb' - - 'spec/support/helpers/filter_spec_helper.rb' - - 'spec/support/shared_examples/metrics/active_record_subscriber_shared_examples.rb' - - 'spec/support/shared_examples/requests/api/notes_shared_examples.rb' - - 'spec/support/shared_examples/uploaders/object_storage_shared_examples.rb' - - 'spec/workers/loose_foreign_keys/cleanup_worker_spec.rb' diff --git a/.rubocop_todo/style/redundant_interpolation.yml b/.rubocop_todo/style/redundant_interpolation.yml index 3747312f2c4..ca7e01ffa61 100644 --- a/.rubocop_todo/style/redundant_interpolation.yml +++ b/.rubocop_todo/style/redundant_interpolation.yml @@ -94,83 +94,4 @@ Style/RedundantInterpolation: - 'qa/qa/tools/generate_perf_testdata.rb' - 'scripts/perf/gc/print_gc_stats.rb' - 'scripts/qa/testcases-check' - - 'spec/controllers/admin/integrations_controller_spec.rb' - - 'spec/features/commits_spec.rb' - - 'spec/features/issues/user_edits_issue_spec.rb' - - 'spec/features/merge_request/user_scrolls_to_note_on_load_spec.rb' - - 'spec/features/merge_request/user_sees_deployment_widget_spec.rb' - - 'spec/features/one_trust_spec.rb' - - 'spec/features/projects/issues/viewing_issues_with_external_authorization_enabled_spec.rb' - - 'spec/features/projects/jobs/user_browses_jobs_spec.rb' - - 'spec/graphql/resolvers/container_repositories_resolver_spec.rb' - - 'spec/helpers/environments_helper_spec.rb' - - 'spec/helpers/snippets_helper_spec.rb' - - 'spec/lib/api/helpers/packages/dependency_proxy_helpers_spec.rb' - - 'spec/lib/api/validations/validators/git_ref_spec.rb' - - 'spec/lib/api/validations/validators/limit_spec.rb' - - 'spec/lib/backup/database_backup_error_spec.rb' - - 'spec/lib/backup/file_backup_error_spec.rb' - - 'spec/lib/banzai/filter/autolink_filter_spec.rb' - - 'spec/lib/banzai/filter/issuable_reference_expansion_filter_spec.rb' - - 'spec/lib/banzai/filter/references/alert_reference_filter_spec.rb' - - 'spec/lib/banzai/filter/references/commit_reference_filter_spec.rb' - - 'spec/lib/banzai/filter/references/issue_reference_filter_spec.rb' - - 'spec/lib/banzai/filter/references/label_reference_filter_spec.rb' - - 'spec/lib/banzai/filter/references/milestone_reference_filter_spec.rb' - - 'spec/lib/banzai/filter/references/project_reference_filter_spec.rb' - - 'spec/lib/banzai/filter/references/user_reference_filter_spec.rb' - - 'spec/lib/feature_spec.rb' - - 'spec/lib/gitlab/background_migration/legacy_upload_mover_spec.rb' - - 'spec/lib/gitlab/background_migration/populate_vulnerability_reads_spec.rb' - - 'spec/lib/gitlab/ci/config/entry/job_spec.rb' - - 'spec/lib/gitlab/ci/config/entry/processable_spec.rb' - - 'spec/lib/gitlab/ci/reports/test_suite_spec.rb' - - 'spec/lib/gitlab/database/batch_count_spec.rb' - - 'spec/lib/gitlab/database/load_balancing/connection_proxy_spec.rb' - - 'spec/lib/gitlab/import_export/group/tree_saver_spec.rb' - - 'spec/lib/gitlab/inactive_projects_deletion_warning_tracker_spec.rb' - - 'spec/lib/gitlab/metrics/dashboard/url_spec.rb' - - 'spec/lib/gitlab/redis/multi_store_spec.rb' - - 'spec/lib/grafana/client_spec.rb' - - 'spec/mailers/notify_spec.rb' - - 'spec/migrations/20220107064845_populate_vulnerability_reads_spec.rb' - - 'spec/models/active_session_spec.rb' - - 'spec/models/clusters/platforms/kubernetes_spec.rb' - - 'spec/models/diff_discussion_spec.rb' - - 'spec/models/namespace_spec.rb' - - 'spec/presenters/project_presenter_spec.rb' - - 'spec/rack_servers/configs/config.ru' - - 'spec/requests/api/alert_management_alerts_spec.rb' - - 'spec/requests/api/markdown_spec.rb' - - 'spec/requests/api/merge_requests_spec.rb' - - 'spec/requests/api/metrics/dashboard/annotations_spec.rb' - - 'spec/requests/api/tags_spec.rb' - - 'spec/requests/api/terraform/state_spec.rb' - - 'spec/requests/projects/google_cloud/deployments_controller_spec.rb' - - 'spec/requests/projects/google_cloud/service_accounts_controller_spec.rb' - - 'spec/routing/project_routing_spec.rb' - - 'spec/services/clusters/kubernetes/create_or_update_service_account_service_spec.rb' - - 'spec/services/groups/transfer_service_spec.rb' - - 'spec/services/members/invite_service_spec.rb' - - 'spec/services/todo_service_spec.rb' - - 'spec/services/todos/destroy/entity_leave_service_spec.rb' - - 'spec/services/users/approve_service_spec.rb' - - 'spec/services/users/ban_service_spec.rb' - - 'spec/services/users/reject_service_spec.rb' - - 'spec/services/users/unban_service_spec.rb' - - 'spec/support/google_api/cloud_platform_helpers.rb' - - 'spec/support/helpers/features/releases_helpers.rb' - - 'spec/support/helpers/graphql_helpers.rb' - - 'spec/support/helpers/kubernetes_helpers.rb' - - 'spec/support/matchers/exceed_query_limit.rb' - - 'spec/support/shared_examples/graphql/notes_creation_shared_examples.rb' - - 'spec/support/shared_examples/graphql/resolvers/packages_resolvers_shared_examples.rb' - - 'spec/support/shared_examples/lib/sentry/client_shared_examples.rb' - - 'spec/support/shared_examples/mailers/notify_shared_examples.rb' - - 'spec/support/shared_examples/requests/api/graphql/packages/group_and_project_packages_list_shared_examples.rb' - - 'spec/support/shared_examples/requests/api/issues_shared_examples.rb' - - 'spec/support/shared_examples/requests/api/notes_shared_examples.rb' - - 'spec/support/shared_examples/services/users/dismiss_user_callout_service_shared_examples.rb' - - 'spec/support_specs/graphql/arguments_spec.rb' - - 'spec/views/projects/commit/_commit_box.html.haml_spec.rb' - 'tooling/rspec_flaky/flaky_example.rb' diff --git a/app/assets/javascripts/diffs/components/diff_discussions.vue b/app/assets/javascripts/diffs/components/diff_discussions.vue index 25d3bda147b..9e399a642d0 100644 --- a/app/assets/javascripts/diffs/components/diff_discussions.vue +++ b/app/assets/javascripts/diffs/components/diff_discussions.vue @@ -88,6 +88,7 @@ export default { :discussions-by-diff-order="true" :line="line" :help-page-path="helpPagePath" + :should-scroll-to-note="false" @noteDeleted="deleteNoteHandler" >