diff --git a/.gitlab/merge_request_templates/Documentation SA Solutions Docs.md b/.gitlab/merge_request_templates/Documentation SA Solutions Docs.md index b433dbeb44d..cb3de36bf52 100644 --- a/.gitlab/merge_request_templates/Documentation SA Solutions Docs.md +++ b/.gitlab/merge_request_templates/Documentation SA Solutions Docs.md @@ -12,25 +12,25 @@ This MR Template ensures that Solutions Docs published here: https://docs.gitlab ## Review -- [ ] I have read the [Solutions Docs Contributors Guide in the GitLab Handbook](https://handbook.gitlab.com/handbook/customer-success/solutions-architects/sa-documentation/) and believe that this contribution complies with the scope and requirements outlined there. +- [ ] I have read the [Solutions Architects GitLab Docs Section](https://handbook.gitlab.com/handbook/solutions-architects/sa-documentation/) and believe that this contribution complies with the scope and requirements outlined there. - [ ] Assign yourself as the **Assignee** of this MR. - [ ] Assign the latest release for the **Milestone**. If you're not sure, [view the list of releases](https://about.gitlab.com/releases/). - [ ] Mention the reviewers in a comment, so they're aware that the MR is ready. -- [ ] If navigation changes are needed, create an MR in the gitlab-docs project according to this documentation process. [Here is an example](https://gitlab.com/gitlab-org/gitlab-docs/-/merge_requests/4863). - - [ ] If making a navigation change, list the Navigation MR here: `link to your navigation update MR` +- [ ] If navigation changes are needed, create a MR to [add a navigation entry](https://docs.gitlab.com/development/documentation/site_architecture/global_nav/#add-a-navigation-entry) in the `docs-gitlab-com` project. + - [ ] If making a navigation change, list the MR here: `link to your navigation update MR`. ## Merging -- [ ] Obtain approval from a member of the Solutions Documentation Approvers Group (CODEOWNERS for the Solutions directory) +- [ ] Obtain approval from a member of the Solutions Documentation Approvers Group (CODEOWNERS for the Solutions directory). When a code owner approves, they can merge. ## Troubleshooting -The pipeline will test for style and link issues. If you have issues you're unable to resolve, -view the documentation [Style Guide](https://docs.gitlab.com/ee/development/documentation/styleguide/) -or ask for assistance in the #docs Slack channel. +The pipeline checks for style and broken links. +For help resolving issues, see the [Documentation Style Guide](https://docs.gitlab.com/development/documentation/styleguide/) +or ask in the #docs Slack channel. -/label ~documentation ~Solutions ~"type::maintenance" ~"maintenance::refactor" +/label ~documentation ~Solutions ~"type::maintenance" ~"maintenance::refactor" /assign me /request_review @DarwinJS @jmoverley diff --git a/.rubocop_todo/rails/enum_hash.yml b/.rubocop_todo/rails/enum_hash.yml deleted file mode 100644 index fc384ad2f42..00000000000 --- a/.rubocop_todo/rails/enum_hash.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -# Cop supports --autocorrect. -Rails/EnumHash: - Exclude: - - 'app/models/activity_pub/releases_subscription.rb' diff --git a/app/assets/javascripts/ci/job_details/components/sidebar/jobs_container.vue b/app/assets/javascripts/ci/job_details/components/sidebar/jobs_container.vue index 6f1de8a86ef..5a7ad84ae9a 100644 --- a/app/assets/javascripts/ci/job_details/components/sidebar/jobs_container.vue +++ b/app/assets/javascripts/ci/job_details/components/sidebar/jobs_container.vue @@ -25,7 +25,9 @@ export default {