diff --git a/.gitlab/merge_request_templates/Deprecations.md b/.gitlab/merge_request_templates/Deprecations.md index dcd5d79e0d0..6a5ee6e74e7 100644 --- a/.gitlab/merge_request_templates/Deprecations.md +++ b/.gitlab/merge_request_templates/Deprecations.md @@ -56,7 +56,7 @@ feature for all reviews. Reviewers will then `approve` the MR and remove themsel - [ ] (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/engineering/ux/technical-writing/#assignments). +- [ ] Required review and approval: [Technical Writer designated to the corresponding DevOps stage/group](https://about.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 4932fbd7f26..2096b06d73b 100644 --- a/.gitlab/merge_request_templates/Documentation.md +++ b/.gitlab/merge_request_templates/Documentation.md @@ -8,7 +8,7 @@ ## Author's checklist -- [ ] Optional. Consider taking [the GitLab Technical Writing Fundamentals course](https://about.gitlab.com/handbook/engineering/ux/technical-writing/fundamentals/). +- [ ] Optional. Consider taking [the GitLab Technical Writing Fundamentals course](https://about.gitlab.com/handbook/product/ux/technical-writing/fundamentals/). - [ ] Follow the: - [Documentation process](https://docs.gitlab.com/ee/development/documentation/workflow.html). - [Documentation guidelines](https://docs.gitlab.com/ee/development/documentation/). @@ -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-attention-request-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/engineering/ux/technical-writing/#assignments). + - The [associated Technical Writer](https://about.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: @@ -34,7 +34,7 @@ Documentation-related MRs should be reviewed by a Technical Writer for a non-blo - [ ] If the content requires it, ensure the information is reviewed by a subject matter expert. - Technical writer review items: - [ ] Ensure docs metadata is present and up-to-date. - - [ ] Ensure the appropriate [labels](https://about.gitlab.com/handbook/engineering/ux/technical-writing/workflow/#labels) are added to this MR. + - [ ] Ensure the appropriate [labels](https://about.gitlab.com/handbook/product/ux/technical-writing/workflow/#labels) are added to this MR. - [ ] Ensure a release milestone is set. - If relevant to this MR, ensure [content topic type](https://docs.gitlab.com/ee/development/documentation/structure.html) principles are in use, including: - [ ] The headings should be something you'd do a Google search for. Instead of `Default behavior`, say something like `Default behavior when you close an issue`. diff --git a/.gitlab/merge_request_templates/Removals.md b/.gitlab/merge_request_templates/Removals.md index 4801af2a123..afe95f853bc 100644 --- a/.gitlab/merge_request_templates/Removals.md +++ b/.gitlab/merge_request_templates/Removals.md @@ -61,7 +61,7 @@ feature for all reviews. Reviewers will `approve` the MR and remove themselves f - [ ] (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/engineering/ux/technical-writing/#assignments). +- [ ] Required review and approval: [Technical Writer designated to the corresponding DevOps stage/group](https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments). ### Tech writer review diff --git a/.rubocop_todo/rspec/file_path.yml b/.rubocop_todo/rspec/file_path.yml index 60ef265fafe..3cf0e969c34 100644 --- a/.rubocop_todo/rspec/file_path.yml +++ b/.rubocop_todo/rspec/file_path.yml @@ -19,6 +19,7 @@ RSpec/FilePath: - 'ee/spec/services/ci/create_pipeline_service/compliance_spec.rb' - 'ee/spec/services/ci/create_pipeline_service/cross_needs_artifacts_spec.rb' - 'ee/spec/services/ci/create_pipeline_service/dast_configuration_spec.rb' + - 'ee/spec/services/ci/create_pipeline_service/limit_active_jobs_spec.rb' - 'ee/spec/services/ci/create_pipeline_service/needs_spec.rb' - 'ee/spec/services/ci/create_pipeline_service/runnable_builds_spec.rb' - 'spec/benchmarks/banzai_benchmark.rb' @@ -52,6 +53,7 @@ RSpec/FilePath: - 'spec/services/ci/create_pipeline_service/environment_spec.rb' - 'spec/services/ci/create_pipeline_service/evaluate_runner_tags_spec.rb' - 'spec/services/ci/create_pipeline_service/include_spec.rb' + - 'spec/services/ci/create_pipeline_service/limit_active_jobs_spec.rb' - 'spec/services/ci/create_pipeline_service/logger_spec.rb' - 'spec/services/ci/create_pipeline_service/merge_requests_spec.rb' - 'spec/services/ci/create_pipeline_service/needs_spec.rb' diff --git a/.rubocop_todo/rspec/scattered_let.yml b/.rubocop_todo/rspec/scattered_let.yml index 16ae879c531..faf2000253a 100644 --- a/.rubocop_todo/rspec/scattered_let.yml +++ b/.rubocop_todo/rspec/scattered_let.yml @@ -96,6 +96,7 @@ RSpec/ScatteredLet: - 'ee/spec/services/incident_management/oncall_rotations/remove_participant_service_spec.rb' - 'ee/spec/services/members/activate_service_spec.rb' - 'ee/spec/services/personal_access_tokens/groups/update_lifetime_service_spec.rb' + - 'ee/spec/services/sbom/ingestion/occurrence_map_spec.rb' - 'ee/spec/services/security/report_summary_service_spec.rb' - 'ee/spec/services/vulnerabilities/create_from_security_finding_service_spec.rb' - 'ee/spec/services/vulnerabilities/findings/create_from_security_finding_service_spec.rb' @@ -205,6 +206,7 @@ RSpec/ScatteredLet: - 'spec/lib/gitlab/sidekiq_middleware/size_limiter/validator_spec.rb' - 'spec/lib/gitlab/template/finders/global_template_finder_spec.rb' - 'spec/lib/gitlab/tree_summary_spec.rb' + - 'spec/lib/gitlab/usage/metrics/instrumentations/gitlab_for_jira_app_proxy_installations_count_metric_spec.rb' - 'spec/lib/gitlab/usage_data_metrics_spec.rb' - 'spec/lib/gitlab/usage_data_spec.rb' - 'spec/lib/gitlab/utils/measuring_spec.rb' diff --git a/app/assets/javascripts/ci_variable_list/components/ci_admin_variables.vue b/app/assets/javascripts/ci_variable_list/components/ci_admin_variables.vue index 59ddf4b19d8..7d91e0f9550 100644 --- a/app/assets/javascripts/ci_variable_list/components/ci_admin_variables.vue +++ b/app/assets/javascripts/ci_variable_list/components/ci_admin_variables.vue @@ -1,5 +1,7 @@