diff --git a/docs/content/code-review/_index.md b/docs/content/code-review/_index.md new file mode 100644 index 000000000000..d0e543bfb8a0 --- /dev/null +++ b/docs/content/code-review/_index.md @@ -0,0 +1,4 @@ +--- +title: "Code review" +weight: 50 +--- \ No newline at end of file diff --git a/docs/content/contribute/create-pr.md b/docs/content/code-review/create-pr.md similarity index 95% rename from docs/content/contribute/create-pr.md rename to docs/content/code-review/create-pr.md index d360042870e6..445fd848411a 100644 --- a/docs/content/contribute/create-pr.md +++ b/docs/content/code-review/create-pr.md @@ -1,6 +1,8 @@ --- title: "Create a pull request" weight: 10 +aliases: + - /contribute/create-pr --- # Create a pull request (PR) @@ -12,7 +14,7 @@ weight: 10 - If you are adding a few fields and also fixing a bug, create one PR for adding the new fields and a separate PR for the bugs. 1. Follow the instructions at [Creating a pull request](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request) to create a pull request to merge your branch into `GoogleCloudPlatform/magic-modules`. - Make sure the PR body includes the text `Fixes GITHUB_ISSUE_LINK.` once per issue resolved by your PR. Replace `GITHUB_ISSUE_LINK` with a link to a GitHub issue from the [provider issue tracker](https://github.com/hashicorp/terraform-provider-google/issues). - - [Write release notes]({{< ref "/contribute/release-notes" >}}) + - [Write release notes]({{< ref "/code-review/release-notes" >}}) ## Code review @@ -28,7 +30,7 @@ weight: 10 - You can push them and test in parallel as well. New CI runs will preempt old ones where possible. 1. Resolve failed [status checks](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks) quickly - Directly ask your reviewer for help if you don't know how to proceed. If there are failed checks they may only check in if there's no progress after a couple days. -1. [Self-review your PR]({{< ref "/contribute/review-pr" >}}) or ask someone else familiar with Terraform to review +1. [Self-review your PR]({{< ref "/code-review/review-pr" >}}) or ask someone else familiar with Terraform to review {{< /hint >}} diff --git a/docs/content/contribute/release-notes.md b/docs/content/code-review/release-notes.md similarity index 99% rename from docs/content/contribute/release-notes.md rename to docs/content/code-review/release-notes.md index 8bd379d2be16..75a10f6a1ebf 100644 --- a/docs/content/contribute/release-notes.md +++ b/docs/content/code-review/release-notes.md @@ -1,6 +1,8 @@ --- title: "Write release notes" weight: 20 +aliases: + - /contribute/release-notes --- # Write release notes diff --git a/docs/content/contribute/review-pr.md b/docs/content/code-review/review-pr.md similarity index 99% rename from docs/content/contribute/review-pr.md rename to docs/content/code-review/review-pr.md index e242b33e8a5f..0101abb68bd4 100644 --- a/docs/content/contribute/review-pr.md +++ b/docs/content/code-review/review-pr.md @@ -1,6 +1,8 @@ --- title: "Review a pull request" weight: 30 +aliases: + - /contribute/review-pr --- # Review a pull request diff --git a/docs/content/contribute/_index.md b/docs/content/contribute/_index.md deleted file mode 100644 index 0374d0fbe2cc..000000000000 --- a/docs/content/contribute/_index.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: "Contribute" -weight: 50 ---- \ No newline at end of file diff --git a/docs/content/contribution-process.md b/docs/content/contribution-process.md index e7683ba25a43..81a75a8a32fc 100644 --- a/docs/content/contribution-process.md +++ b/docs/content/contribution-process.md @@ -32,8 +32,8 @@ This page explains how you can contribute code and documentation to the `magic-m + [Make a breaking change]({{< ref "/breaking-changes/make-a-breaking-change" >}}) 1. [Generate the providers]({{< ref "/develop/generate-providers" >}}) that include your change. 1. [Run provider tests locally]({{< ref "/test/run-tests" >}}) that are relevant to the change you made -1. [Create a pull request (PR)]({{< ref "/contribute/create-pr" >}}) -1. Make changes in response to [code review]({{< ref "/contribute/create-pr#code-review" >}}) +1. [Create a pull request (PR)]({{< ref "/code-review/create-pr" >}}) +1. Make changes in response to [code review]({{< ref "/code-review/create-pr#code-review" >}}) ## After your change is merged diff --git a/docs/content/test/run-tests.md b/docs/content/test/run-tests.md index b818769d8095..60ff14c06118 100644 --- a/docs/content/test/run-tests.md +++ b/docs/content/test/run-tests.md @@ -298,4 +298,4 @@ Terraform will resume its normal behaviour of pulling published provider version ## What's next? -[Create a pull request]({{< ref "/contribute/create-pr" >}}) +[Create a pull request]({{< ref "/code-review/create-pr" >}})