From 97a128c1d1bf45bcc00d5fae037f840eff1ae4e0 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 21 Mar 2023 15:09:11 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/review.gitlab-ci.yml | 2 +- app/assets/javascripts/api/projects_api.js | 2 +- .../boards/components/board_card_inner.vue | 2 +- .../boards/components/issue_due_date.vue | 9 +- .../boards/components/issue_time_estimate.vue | 2 +- .../diffs/components/tree_list.vue | 4 +- .../components/related_issuable_item.vue | 5 +- .../components/performance_bar_app.vue | 15 + .../components/context_switcher.vue | 43 ++- .../components/context_switcher_toggle.vue | 6 +- .../components/super_sidebar.vue | 16 +- app/assets/stylesheets/framework/files.scss | 18 +- .../stylesheets/framework/super_sidebar.scss | 3 + .../concerns/mutations/finds_namespace.rb | 11 + app/graphql/mutations/work_items/create.rb | 30 +- app/graphql/resolvers/work_items_resolver.rb | 2 +- .../types/ci/config/include_type_enum.rb | 1 + app/graphql/types/work_item_type.rb | 5 +- app/models/issue.rb | 22 +- app/models/namespaces/project_namespace.rb | 2 + app/models/project.rb | 8 +- app/policies/issuable_policy.rb | 8 +- app/policies/issue_policy.rb | 5 +- .../group_project_namespace_shared_policy.rb | 11 + .../concerns/issues/resolve_discussions.rb | 6 +- app/services/issues/base_service.rb | 6 +- app/services/issues/build_service.rb | 18 +- app/services/issues/create_service.rb | 5 +- .../widgets/milestone_service/base_service.rb | 11 +- .../groups/settings/_permissions.html.haml | 3 +- .../development/data_transfer_monitoring.yml | 2 +- ...p_clear_over_limit_notification_flags.yml} | 12 +- config/initializers/1_settings.rb | 3 + config/initializers/peek.rb | 1 + config/sidekiq_queues.yml | 2 + ...uilds_constraints_for_list_partitioning.rb | 15 + ...les_that_may_have_been_deleted_by_a_bug.rb | 37 ++ ...ap_ci_runner_machine_builds_primary_key.rb | 41 +++ db/schema_migrations/20230309085547 | 1 + db/schema_migrations/20230310213308 | 1 + db/schema_migrations/20230316114426 | 1 + db/structure.sql | 5 +- doc/api/graphql/reference/index.md | 8 +- doc/api/merge_requests.md | 14 +- .../dashboards/error_budget_detail.md | 25 -- .../visibility_and_access_controls.md | 6 + doc/user/group/manage.md | 7 +- .../group/value_stream_analytics/index.md | 12 +- .../project/merge_requests/revert_changes.md | 3 +- doc/user/project/quick_actions.md | 189 +++++----- doc/user/project/settings/import_export.md | 3 +- doc/user/search/index.md | 10 +- lib/gitlab/ci/ansi2json/parser.rb | 4 +- .../schema_validation/inconsistency.rb | 57 +++ .../database/schema_validation/index.rb | 25 ++ .../validators/base_validator.rb | 8 +- .../different_definition_indexes.rb | 4 +- .../different_definition_triggers.rb | 4 +- .../validators/extra_indexes.rb | 10 +- .../validators/extra_triggers.rb | 10 +- .../validators/missing_indexes.rb | 10 +- .../validators/missing_triggers.rb | 10 +- lib/gitlab/gon_helper.rb | 1 - .../issue_activity_unique_counter.rb | 17 +- lib/peek/views/zoekt.rb | 47 +++ lib/tasks/gitlab/db.rake | 17 + locale/gitlab.pot | 9 + spec/db/schema_spec.rb | 3 +- spec/frontend/api/projects_api_spec.js | 18 +- .../admin_register_runner_app_spec.js | 4 +- .../admin_runner_show_app_spec.js | 6 +- .../admin_runners/admin_runners_app_spec.js | 14 +- .../registration_instructions_spec.js | 2 +- .../components/runner_create_form_spec.js | 8 +- .../components/runner_delete_button_spec.js | 12 +- .../ci/runner/components/runner_list_spec.js | 2 +- .../components/runner_pause_button_spec.js | 2 +- .../runner_platforms_radio_group_spec.js | 2 +- .../components/runner_platforms_radio_spec.js | 4 +- .../runner/components/runner_projects_spec.js | 2 +- .../components/stat/runner_count_spec.js | 10 +- .../group_runner_show_app_spec.js | 4 +- .../group_runners/group_runners_app_spec.js | 10 +- spec/frontend/ci/runner/sentry_utils_spec.js | 2 +- .../components/error_tracking_list_spec.js | 25 +- .../frequent_items/components/app_spec.js | 1 - .../frequent_items/store/actions_spec.js | 1 - .../components/import_history_app_spec.js | 1 - .../components/context_switcher_spec.js | 29 +- .../components/super_sidebar_spec.js | 25 ++ .../types/ci/config/include_type_enum_spec.rb | 2 +- spec/graphql/types/work_item_type_spec.rb | 1 + .../schema_validation/inconsistency_spec.rb | 64 ++++ .../database/schema_validation/runner_spec.rb | 2 +- .../index_inconsistencies_metric_spec.rb | 2 +- .../issue_activity_unique_counter_spec.rb | 4 +- spec/models/ci/bridge_spec.rb | 2 +- spec/models/ci/build_need_spec.rb | 2 +- spec/models/ci/build_runner_session_spec.rb | 2 +- spec/models/ci/build_spec.rb | 2 +- spec/models/ci/build_trace_metadata_spec.rb | 2 +- spec/models/ci/sources/pipeline_spec.rb | 2 +- spec/models/issue_spec.rb | 6 +- spec/requests/api/commit_statuses_spec.rb | 4 +- .../mutations/work_items/create_spec.rb | 99 +++-- spec/services/issues/close_service_spec.rb | 11 +- spec/services/issues/create_service_spec.rb | 10 +- spec/services/issues/reopen_service_spec.rb | 9 +- spec/services/issues/update_service_spec.rb | 16 +- .../work_items/create_service_spec.rb | 338 ++++++++++-------- .../ci/partitioning_testing/rspec_hooks.rb | 4 + ...issuable_update_service_shared_examples.rb | 10 +- .../issuable_activity_shared_examples.rb | 4 +- spec/tasks/gitlab/db_rake_spec.rb | 34 ++ spec/workers/every_sidekiq_worker_spec.rb | 1 + 115 files changed, 1188 insertions(+), 544 deletions(-) create mode 100644 app/graphql/mutations/concerns/mutations/finds_namespace.rb rename config/feature_flags/development/{full_path_project_search.yml => free_user_cap_clear_over_limit_notification_flags.yml} (50%) create mode 100644 db/post_migrate/20230309085547_prepare_ci_builds_constraints_for_list_partitioning.rb create mode 100644 db/post_migrate/20230310213308_sync_security_policy_rule_schedules_that_may_have_been_deleted_by_a_bug.rb create mode 100644 db/post_migrate/20230316114426_swap_ci_runner_machine_builds_primary_key.rb create mode 100644 db/schema_migrations/20230309085547 create mode 100644 db/schema_migrations/20230310213308 create mode 100644 db/schema_migrations/20230316114426 create mode 100644 lib/gitlab/database/schema_validation/inconsistency.rb create mode 100644 lib/gitlab/database/schema_validation/index.rb create mode 100644 lib/peek/views/zoekt.rb create mode 100644 spec/lib/gitlab/database/schema_validation/inconsistency_spec.rb diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml index 3582b584f66..6d38c651985 100644 --- a/.gitlab/ci/review.gitlab-ci.yml +++ b/.gitlab/ci/review.gitlab-ci.yml @@ -16,7 +16,7 @@ review-cleanup: - install_gitlab_gem - setup_gcloud script: - - scripts/review_apps/automated_cleanup.rb --dry-run="${DRY_RUN}" || (scripts/slack review-apps-monitoring "☠️ \`${CI_JOB_NAME}\` failed! ☠️ See ${CI_JOB_URL} - " warning "GitLab Bot" && exit 1); + - scripts/review_apps/automated_cleanup.rb --dry-run="${DRY_RUN:-false}" || (scripts/slack review-apps-monitoring "☠️ \`${CI_JOB_NAME}\` failed! ☠️ See ${CI_JOB_URL} - " warning "GitLab Bot" && exit 1); review-stop: extends: diff --git a/app/assets/javascripts/api/projects_api.js b/app/assets/javascripts/api/projects_api.js index 5c0d101ef5b..5a794dcd035 100644 --- a/app/assets/javascripts/api/projects_api.js +++ b/app/assets/javascripts/api/projects_api.js @@ -21,7 +21,7 @@ export function getProjects(query, options, callback = () => {}) { defaults.membership = true; } - if (gon.features.fullPathProjectSearch && query?.includes('/')) { + if (query?.includes('/')) { defaults.search_namespaces = true; } diff --git a/app/assets/javascripts/boards/components/board_card_inner.vue b/app/assets/javascripts/boards/components/board_card_inner.vue index 88f51c71e06..befd04c29ae 100644 --- a/app/assets/javascripts/boards/components/board_card_inner.vue +++ b/app/assets/javascripts/boards/components/board_card_inner.vue @@ -275,7 +275,7 @@ export default { - + {{ __('Due date') }} diff --git a/app/assets/javascripts/boards/components/issue_time_estimate.vue b/app/assets/javascripts/boards/components/issue_time_estimate.vue index bc12717a92d..611e875fa40 100644 --- a/app/assets/javascripts/boards/components/issue_time_estimate.vue +++ b/app/assets/javascripts/boards/components/issue_time_estimate.vue @@ -38,7 +38,7 @@ export default { - + - + item.metric !== 'zkt', + ); + } }, mounted() { this.currentRequest = this.requestId; diff --git a/app/assets/javascripts/super_sidebar/components/context_switcher.vue b/app/assets/javascripts/super_sidebar/components/context_switcher.vue index fe33ad9ce4b..2f036c7ddcc 100644 --- a/app/assets/javascripts/super_sidebar/components/context_switcher.vue +++ b/app/assets/javascripts/super_sidebar/components/context_switcher.vue @@ -1,6 +1,6 @@ @@ -104,13 +126,24 @@ export default {
-