From bf03e90e020f59322873be25e5fc13ba1170eb02 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 6 Dec 2023 18:16:45 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../merge_request_templates/Deprecations.md | 2 +- .../merge_request_templates/Documentation.md | 2 +- app/assets/javascripts/ensure_data.js | 2 +- danger/documentation/Dangerfile | 4 +- .../templates/_deprecation_template.md.erb | 2 +- ...ismissal_reason_in_vulnerability_reads.yml | 1 - ...203_remove_requirements_ignored_columns.rb | 34 +----------- ...dismissal_reason_in_vulnerability_reads.rb | 8 +-- db/structure.sql | 23 ++++++++ .../audit_event_types.md | 3 +- doc/administration/dedicated/index.md | 8 ++- doc/api/graphql/reference/index.md | 32 ++++++++++- .../blueprints/new_diffs/index.md | 2 +- doc/ci/variables/predefined_variables.md | 4 +- doc/development/import_export.md | 2 + doc/development/internal_api/index.md | 12 +++- doc/index.md | 2 +- .../advanced_search/elasticsearch.md | 2 +- doc/topics/cron/index.md | 2 +- doc/update/deprecations.md | 2 +- doc/update/versions/gitlab_16_changes.md | 4 ++ doc/user/enterprise_user/index.md | 8 +-- doc/user/group/index.md | 4 +- doc/user/group/saml_sso/index.md | 17 +++--- .../project/merge_requests/approvals/rules.md | 28 +++++++--- .../project/repository/forking_workflow.md | 2 +- .../repository/img/update-fork_v15_11.png | Bin 8581 -> 0 bytes .../repository/img/update-fork_v16_6.png | Bin 0 -> 15603 bytes doc/user/tasks.md | 52 +++++++++++++++--- .../cycle_analytics/request_params.rb | 4 +- locale/gitlab.pot | 6 ++ .../docs/templates/audit_event_types.md.erb | 2 +- tooling/graphql/docs/helper.rb | 2 +- workhorse/README.md | 14 ----- 34 files changed, 180 insertions(+), 112 deletions(-) delete mode 100644 doc/user/project/repository/img/update-fork_v15_11.png create mode 100644 doc/user/project/repository/img/update-fork_v16_6.png delete mode 100644 workhorse/README.md diff --git a/.gitlab/merge_request_templates/Deprecations.md b/.gitlab/merge_request_templates/Deprecations.md index 0f6cdf6a1c3..fb998dae6c1 100644 --- a/.gitlab/merge_request_templates/Deprecations.md +++ b/.gitlab/merge_request_templates/Deprecations.md @@ -54,7 +54,7 @@ feature for all reviews. Reviewers will then approve the MR and remove themselve - [ ] (Recommended) PMM - [ ] (Optional) Product Designer - [ ] (Optional) Group Manager or Director -- [ ] Required review and approval: [Technical Writer designated to the corresponding DevOps stage/group](https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments). +- [ ] Required review and approval: [Technical Writer designated to the corresponding DevOps stage/group](https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments). ### Tech writer review diff --git a/.gitlab/merge_request_templates/Documentation.md b/.gitlab/merge_request_templates/Documentation.md index bc736200046..6617184cad7 100644 --- a/.gitlab/merge_request_templates/Documentation.md +++ b/.gitlab/merge_request_templates/Documentation.md @@ -16,7 +16,7 @@ - [ ] If you're adding or changing the main heading of the page (H1), ensure that the [product tier badge](https://docs.gitlab.com/ee/development/documentation/styleguide/index.html#product-tier-badges) is added. - [ ] If you are a GitLab team member, [request a review](https://docs.gitlab.com/ee/development/code_review.html#dogfooding-the-reviewers-feature) based on: - The documentation page's [metadata](https://docs.gitlab.com/ee/development/documentation/#metadata). - - The [associated Technical Writer](https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments). + - The [associated Technical Writer](https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments). If you are a GitLab team member and only adding documentation, do not add any of the following labels: diff --git a/app/assets/javascripts/ensure_data.js b/app/assets/javascripts/ensure_data.js index ddb34e59144..1a4b57f0beb 100644 --- a/app/assets/javascripts/ensure_data.js +++ b/app/assets/javascripts/ensure_data.js @@ -1,4 +1,4 @@ -import emptySvg from '@gitlab/svgs/dist/illustrations/security-dashboard-empty-state.svg?raw'; +import emptySvg from '@gitlab/svgs/dist/illustrations/empty-state/empty-dashboard-md.svg?raw'; import { GlEmptyState } from '@gitlab/ui'; import * as Sentry from '~/sentry/sentry_browser_wrapper'; import { __ } from '~/locale'; diff --git a/danger/documentation/Dangerfile b/danger/documentation/Dangerfile index 1bb381244d6..f7fa0d9fcf2 100644 --- a/danger/documentation/Dangerfile +++ b/danger/documentation/Dangerfile @@ -59,13 +59,13 @@ The following files require a review from a technical writer: The review does not need to block merging this merge request. See the: - [Metadata for the `*.md` files](https://docs.gitlab.com/ee/development/documentation/#metadata) 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](https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments) for that stage and group. +- The [Technical Writer assigned](https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments) for that stage and group. - [Documentation workflows](https://docs.gitlab.com/ee/development/documentation/workflow.html) for information on when to assign a merge request for review. MSG # Documentation should be updated for feature::addition and feature::enhancement DOCUMENTATION_UPDATE_MISSING = <<~MSG -~"feature::addition" and ~"feature::enhancement" merge requests normally have a documentation change. Consider adding a documentation update or confirming the documentation plan with the [Technical Writer counterpart](https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments). +~"feature::addition" and ~"feature::enhancement" merge requests normally have a documentation change. Consider adding a documentation update or confirming the documentation plan with the [Technical Writer counterpart](https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments). For more information, see: diff --git a/data/deprecations/templates/_deprecation_template.md.erb b/data/deprecations/templates/_deprecation_template.md.erb index 2e0d2696f0f..4b072e8b695 100644 --- a/data/deprecations/templates/_deprecation_template.md.erb +++ b/data/deprecations/templates/_deprecation_template.md.erb @@ -1,7 +1,7 @@ --- stage: none group: none -info: "See the Technical Writers assigned to Development Guidelines: https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments-to-development-guidelines" +info: "See the Technical Writers assigned to Development Guidelines: https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments-to-development-guidelines" toc: false --- diff --git a/db/docs/batched_background_migrations/backfill_dismissal_reason_in_vulnerability_reads.yml b/db/docs/batched_background_migrations/backfill_dismissal_reason_in_vulnerability_reads.yml index 34954d9dd82..1f76acc4def 100644 --- a/db/docs/batched_background_migrations/backfill_dismissal_reason_in_vulnerability_reads.yml +++ b/db/docs/batched_background_migrations/backfill_dismissal_reason_in_vulnerability_reads.yml @@ -6,4 +6,3 @@ feature_category: vulnerability_management introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/123518 queued_migration_version: 20230612232000 milestone: '16.1' -finalized_by: '20231201144826' diff --git a/db/post_migrate/20231129170203_remove_requirements_ignored_columns.rb b/db/post_migrate/20231129170203_remove_requirements_ignored_columns.rb index 47ae8d27964..d85f07e5d05 100644 --- a/db/post_migrate/20231129170203_remove_requirements_ignored_columns.rb +++ b/db/post_migrate/20231129170203_remove_requirements_ignored_columns.rb @@ -5,41 +5,11 @@ class RemoveRequirementsIgnoredColumns < Gitlab::Database::Migration[2.2] disable_ddl_transaction! - CONSTRAINT_NAME = 'check_785ae25b9d' - NAME_INDEX = 'index_requirements_on_title_trigram' - FOREIGN_KEY = 'fk_rails_33fed8aa4e' - def up - remove_column(:requirements, :created_at, if_exists: true) - remove_column(:requirements, :updated_at, if_exists: true) - remove_column(:requirements, :author_id, if_exists: true) - remove_column(:requirements, :cached_markdown_version, if_exists: true) - remove_column(:requirements, :state, if_exists: true) - remove_column(:requirements, :title, if_exists: true) - remove_column(:requirements, :title_html, if_exists: true) - remove_column(:requirements, :description, if_exists: true) - remove_column(:requirements, :description_html, if_exists: true) + # no-op to mitigate https://gitlab.com/gitlab-com/gl-infra/production/-/issues/17224 end def down - add_column(:requirements, :created_at, :datetime_with_timezone, if_not_exists: true) - add_column(:requirements, :updated_at, :datetime_with_timezone, if_not_exists: true) - add_column(:requirements, :author_id, :integer, if_not_exists: true) - add_column(:requirements, :cached_markdown_version, :integer, if_not_exists: true) - add_column(:requirements, :state, :smallint, default: 1, if_not_exists: true) - add_column(:requirements, :title, :string, limit: 255, if_not_exists: true) - add_column(:requirements, :title_html, :text, if_not_exists: true) - add_column(:requirements, :description, :text, if_not_exists: true) - add_column(:requirements, :description_html, :text, if_not_exists: true) - - add_check_constraint(:requirements, "char_length(description) <= 10000", CONSTRAINT_NAME) - - add_concurrent_foreign_key(:requirements, :users, column: :author_id, name: FOREIGN_KEY, on_delete: :nullify) - - add_concurrent_index(:requirements, :created_at) - add_concurrent_index(:requirements, :updated_at) - add_concurrent_index(:requirements, :author_id) - add_concurrent_index(:requirements, :state) - add_concurrent_index(:requirements, :title, name: NAME_INDEX, using: :gin, opclass: { name: :gin_trgm_ops }) + # no-op to mitigate https://gitlab.com/gitlab-com/gl-infra/production/-/issues/17224 end end diff --git a/db/post_migrate/20231201144826_finalize_backfill_dismissal_reason_in_vulnerability_reads.rb b/db/post_migrate/20231201144826_finalize_backfill_dismissal_reason_in_vulnerability_reads.rb index a7fc4a14102..bb85fff2ebd 100644 --- a/db/post_migrate/20231201144826_finalize_backfill_dismissal_reason_in_vulnerability_reads.rb +++ b/db/post_migrate/20231201144826_finalize_backfill_dismissal_reason_in_vulnerability_reads.rb @@ -8,13 +8,7 @@ class FinalizeBackfillDismissalReasonInVulnerabilityReads < Gitlab::Database::Mi restrict_gitlab_migration gitlab_schema: :gitlab_main def up - ensure_batched_background_migration_is_finished( - job_class_name: 'BackfillDismissalReasonInVulnerabilityReads', - table_name: :vulnerability_reads, - column_name: :id, - job_arguments: [], - finalize: true - ) + # no-op to fix to mitigate https://gitlab.com/gitlab-com/gl-infra/production/-/issues/17224 end def down; end diff --git a/db/structure.sql b/db/structure.sql index a6a80d9e773..551de511faf 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -22805,9 +22805,19 @@ ALTER SEQUENCE required_code_owners_sections_id_seq OWNED BY required_code_owner CREATE TABLE requirements ( id bigint NOT NULL, + created_at timestamp with time zone, + updated_at timestamp with time zone, project_id integer NOT NULL, + author_id integer, iid integer NOT NULL, + cached_markdown_version integer, + state smallint DEFAULT 1, + title character varying(255), + title_html text, + description text, + description_html text, issue_id bigint, + CONSTRAINT check_785ae25b9d CHECK ((char_length(description) <= 10000)), CONSTRAINT check_requirement_issue_not_null CHECK ((issue_id IS NOT NULL)) ); @@ -34357,12 +34367,22 @@ CREATE INDEX index_requirements_management_test_reports_on_build_id ON requireme CREATE INDEX index_requirements_management_test_reports_on_issue_id ON requirements_management_test_reports USING btree (issue_id); +CREATE INDEX index_requirements_on_author_id ON requirements USING btree (author_id); + +CREATE INDEX index_requirements_on_created_at ON requirements USING btree (created_at); + CREATE UNIQUE INDEX index_requirements_on_issue_id ON requirements USING btree (issue_id); CREATE INDEX index_requirements_on_project_id ON requirements USING btree (project_id); CREATE UNIQUE INDEX index_requirements_on_project_id_and_iid ON requirements USING btree (project_id, iid) WHERE (project_id IS NOT NULL); +CREATE INDEX index_requirements_on_state ON requirements USING btree (state); + +CREATE INDEX index_requirements_on_title_trigram ON requirements USING gin (title gin_trgm_ops); + +CREATE INDEX index_requirements_on_updated_at ON requirements USING btree (updated_at); + CREATE INDEX index_requirements_project_id_user_id_id_and_target_type ON todos USING btree (project_id, user_id, id, target_type); CREATE INDEX index_requirements_user_id_and_target_type ON todos USING btree (user_id, target_type); @@ -38644,6 +38664,9 @@ ALTER TABLE ONLY alert_management_alert_metric_images ALTER TABLE ONLY suggestions ADD CONSTRAINT fk_rails_33b03a535c FOREIGN KEY (note_id) REFERENCES notes(id) ON DELETE CASCADE; +ALTER TABLE ONLY requirements + ADD CONSTRAINT fk_rails_33fed8aa4e FOREIGN KEY (author_id) REFERENCES users(id) ON DELETE SET NULL; + ALTER TABLE ONLY metrics_dashboard_annotations ADD CONSTRAINT fk_rails_345ab51043 FOREIGN KEY (cluster_id) REFERENCES clusters(id) ON DELETE CASCADE; diff --git a/doc/administration/audit_event_streaming/audit_event_types.md b/doc/administration/audit_event_streaming/audit_event_types.md index cc396a6345c..c5a97e469a9 100644 --- a/doc/administration/audit_event_streaming/audit_event_types.md +++ b/doc/administration/audit_event_streaming/audit_event_types.md @@ -1,7 +1,7 @@ --- stage: Govern group: Compliance -info: "See the Technical Writers assigned to Development Guidelines: https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments-to-development-guidelines" +info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments" --- - - -