From e797ca243f321b79c8d3f7ce59391236c33a34e2 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 21 Nov 2024 00:16:09 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/test-on-cng/main.gitlab-ci.yml | 7 - .gitlab/ci/test-on-gdk/main.gitlab-ci.yml | 1 - .../glql/components/presenters/list.vue | 2 +- .../glql/components/presenters/table.vue | 2 +- .../components/related_issuable_input.vue | 3 +- .../command_palette/command_palette_items.vue | 2 +- .../command_palette/fake_search_input.vue | 2 +- .../command_palette/search_item.vue | 4 +- .../components/frequent_item.vue | 2 +- .../components/frequent_items.vue | 2 +- .../components/global_search.vue | 6 +- .../global_search_autocomplete_items.vue | 4 +- .../global_search_hover_overlay.vue | 2 +- .../components/global_search_scoped_items.vue | 3 +- .../stylesheets/framework/super_sidebar.scss | 3 +- .../page_bundles/notes/_notes_base.scss | 8 +- ..._remove_members_last_activity_on_column.rb | 15 + ...l_project_rules_on_project_id_rule_type.rb | 18 + ...ct_rules_on_project_id_config_id_and_id.rb | 19 + ...les_on_project_id_policy_rule_id_and_id.rb | 19 + ...ons_on_project_id_policy_rule_id_and_id.rb | 18 + ...r_rules_on_config_id_and_policy_rule_id.rb | 17 + ...ex_approval_project_rules_on_project_id.rb | 16 + ..._result_policy_violations_on_project_id.rb | 16 + db/schema_migrations/20241112084921 | 1 + db/schema_migrations/20241114225103 | 1 + db/schema_migrations/20241114225309 | 1 + db/schema_migrations/20241114225508 | 1 + db/schema_migrations/20241114225528 | 1 + db/schema_migrations/20241114231251 | 1 + db/schema_migrations/20241114231606 | 1 + db/schema_migrations/20241114231724 | 1 + db/structure.sql | 13 +- doc/administration/dedicated/maintenance.md | 2 +- .../dedicated/tenant_overview.md | 42 +- doc/administration/instance_limits.md | 2 +- doc/api/groups.md | 2 +- doc/api/members.md | 22 +- doc/development/code_suggestions/index.md | 2 +- doc/development/feature_flags/controls.md | 66 +- ...itlab_instrumentation_for_opentelemetry.md | 4 +- doc/development/work_items.md | 2 +- .../visual_studio_code/custom_queries.md | 5 +- .../visual_studio_code/index.md | 15 +- .../visual_studio_code/remote_urls.md | 32 +- .../visual_studio_code/settings.md | 65 +- .../visual_studio_code/troubleshooting.md | 4 +- doc/integration/google_cloud_iam.md | 6 +- .../coverage_fuzzing/index.md | 2 +- doc/user/packages/generic_packages/index.md | 620 ++++++++++++------ doc/user/packages/package_registry/index.md | 2 +- doc/user/project/releases/release_fields.md | 2 +- doc/user/reserved_names.md | 2 +- .../workspace/gitlab_agent_configuration.md | 2 +- qa/qa/runtime/fixtures.rb | 2 +- .../api/3_create/repository/files_spec.rb | 5 +- .../features/api/9_data_stores/users_spec.rb | 9 +- .../projects/pipelines/pipelines_spec.rb | 5 +- .../__snapshots__/search_item_spec.js.snap | 10 +- 59 files changed, 787 insertions(+), 357 deletions(-) create mode 100644 db/post_migrate/20241112084921_remove_members_last_activity_on_column.rb create mode 100644 db/post_migrate/20241114225103_add_index_approval_project_rules_on_project_id_rule_type.rb create mode 100644 db/post_migrate/20241114225309_add_index_approval_project_rules_on_project_id_config_id_and_id.rb create mode 100644 db/post_migrate/20241114225508_add_index_approval_mr_rules_on_project_id_policy_rule_id_and_id.rb create mode 100644 db/post_migrate/20241114225528_add_index_scan_result_policy_violations_on_project_id_policy_rule_id_and_id.rb create mode 100644 db/post_migrate/20241114231251_drop_index_approval_mr_rules_on_config_id_and_policy_rule_id.rb create mode 100644 db/post_migrate/20241114231606_drop_index_approval_project_rules_on_project_id.rb create mode 100644 db/post_migrate/20241114231724_drop_index_scan_result_policy_violations_on_project_id.rb create mode 100644 db/schema_migrations/20241112084921 create mode 100644 db/schema_migrations/20241114225103 create mode 100644 db/schema_migrations/20241114225309 create mode 100644 db/schema_migrations/20241114225508 create mode 100644 db/schema_migrations/20241114225528 create mode 100644 db/schema_migrations/20241114231251 create mode 100644 db/schema_migrations/20241114231606 create mode 100644 db/schema_migrations/20241114231724 diff --git a/.gitlab/ci/test-on-cng/main.gitlab-ci.yml b/.gitlab/ci/test-on-cng/main.gitlab-ci.yml index 9e5359ce6f4..3d9574560e6 100644 --- a/.gitlab/ci/test-on-cng/main.gitlab-ci.yml +++ b/.gitlab/ci/test-on-cng/main.gitlab-ci.yml @@ -70,11 +70,6 @@ workflow: NAMESPACE: gitlab KUBECONFIG: /root/.kube/config BUNDLE_WITHOUT: development - GITLAB_USERNAME: root - GITLAB_PASSWORD: 5iveL!fe - GITLAB_ADMIN_USERNAME: root - GITLAB_ADMIN_PASSWORD: 5iveL!fe - GITLAB_QA_ADMIN_ACCESS_TOKEN: $QA_ADMIN_ACCESS_TOKEN RSPEC_LAST_RUN_RESULTS_FILE: "$CI_PROJECT_DIR/qa/tmp/examples.txt" QA_DOCKER_NETWORK: host QA_GENERATE_ALLURE_REPORT: "true" @@ -95,8 +90,6 @@ workflow: bundle exec cng create deployment "${DEPLOYMENT_TYPE}" \ --gitlab-domain "${GITLAB_DOMAIN}" \ --timeout 5m \ - --admin-password "${GITLAB_ADMIN_PASSWORD}" \ - --admin-token "${GITLAB_QA_ADMIN_ACCESS_TOKEN}" \ --chart-sha "${GITLAB_HELM_CHART_REF}" \ --retry 1 \ --ci \ diff --git a/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml b/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml index 8d91bec7e75..8b529eef111 100644 --- a/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml +++ b/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml @@ -85,7 +85,6 @@ include: QA_DOCKER_NETWORK: host QA_DISABLE_RSPEC_RETRY: "true" QA_GITLAB_URL: http://gdk.test:3000 - GITLAB_QA_ADMIN_ACCESS_TOKEN: $QA_ADMIN_ACCESS_TOKEN FF_NETWORK_PER_BUILD: "true" RSPEC_LAST_RUN_RESULTS_FILE: "$CI_PROJECT_DIR/qa/tmp/examples.txt" COVERBAND_ENABLED: "$COVERBAND_ENABLED" # explicitly define variable so it is passed in to gdk service container diff --git a/app/assets/javascripts/glql/components/presenters/list.vue b/app/assets/javascripts/glql/components/presenters/list.vue index ed52e1200a8..68686164441 100644 --- a/app/assets/javascripts/glql/components/presenters/list.vue +++ b/app/assets/javascripts/glql/components/presenters/list.vue @@ -38,7 +38,7 @@ export default { return this.config.fields; }, docsPath() { - return helpPagePath('user/glql'); + return helpPagePath('user/glql/index'); }, }, i18n: { diff --git a/app/assets/javascripts/glql/components/presenters/table.vue b/app/assets/javascripts/glql/components/presenters/table.vue index bfb941b5d2f..3bbf3ac2a86 100644 --- a/app/assets/javascripts/glql/components/presenters/table.vue +++ b/app/assets/javascripts/glql/components/presenters/table.vue @@ -39,7 +39,7 @@ export default { }, computed: { docsPath() { - return helpPagePath('user/glql'); + return helpPagePath('user/glql/index'); }, }, async mounted() { diff --git a/app/assets/javascripts/related_issues/components/related_issuable_input.vue b/app/assets/javascripts/related_issues/components/related_issuable_input.vue index 14974d5dec4..337e5ea07e9 100644 --- a/app/assets/javascripts/related_issues/components/related_issuable_input.vue +++ b/app/assets/javascripts/related_issues/components/related_issuable_input.vue @@ -13,6 +13,7 @@ import IssueToken from './issue_token.vue'; const SPACE_FACTOR = 1; export default { + TYPE_ISSUE, name: 'RelatedIssuableInput', components: { GlFormGroup, @@ -228,7 +229,7 @@ export default { -