diff --git a/doc/user/discussions/index.md b/doc/user/discussions/index.md index 341d7460f83f81ec8df3850b59929e7991794e39..034e2e45127b41d04a35617ea43bb1e135f98937 100644 --- a/doc/user/discussions/index.md +++ b/doc/user/discussions/index.md @@ -78,7 +78,8 @@ When you mention a group in a comment, every member of the group gets a to-do it added to their To-do list. 1. On the left sidebar, select **Search or go to** and find your project. -1. Select **Issues** or **Merge requests**, and find your issue or merge request. +1. For merge requests, select **Code > Merge requests**, and find your merge request. +1. For issues, select **Plan > Issues**, and find your issue. 1. In a comment, type `@` followed by the user, group, or subgroup namespace. For example, `@alex`, `@alex-team`, or `@alex-team/marketing`. 1. Select **Comment**. @@ -98,7 +99,7 @@ persist, even when you: To add a commit diff comment: 1. On the left sidebar, select **Search or go to** and find your project. -1. Select **Merge requests**, and find your merge request. +1. Select **Code > Merge requests**, and find your merge request. 1. Select the **Commits** tab, then select the commit message. 1. By the line you want to comment on, hover over the line number and select **Comment** (**{comment}**). You can select multiple lines by dragging the **Comment** (**{comment}**) icon. @@ -160,7 +161,8 @@ Prerequisites: To lock an issue or merge request: 1. On the left sidebar, select **Search or go to** and find your project. -1. Select **Issues** or **Merge requests**, and find your issue or merge request. +1. For merge requests, select **Code > Merge requests**, and find your merge request. +1. For issues, select **Plan > Issues**, and find your issue. 1. On the top right, select **Merge request actions** or **Issue actions** (**{ellipsis_v}**), then select **Lock discussion**. A system note is added to the page details. diff --git a/doc/user/project/merge_requests/changes.md b/doc/user/project/merge_requests/changes.md index 513010b01e2273611ce032eb4f382493988a2059..780041ac411469be2b10433f3f72175fce010866 100644 --- a/doc/user/project/merge_requests/changes.md +++ b/doc/user/project/merge_requests/changes.md @@ -24,7 +24,7 @@ in our development documentation. To view the diff of changes included in a merge request: 1. On the left sidebar, select **Search or go to** and find your project. -1. Select **Merge requests** and find your merge request. +1. Select **Code > Merge requests** and find your merge request. 1. Below the merge request title, select **Changes**. 1. If the merge request changes many files, you can jump directly to a specific file: 1. Select **Show file browser** (**{file-tree}**) or press <kbd>F</kbd> to display the file tree. @@ -45,7 +45,7 @@ so it [applies to all merge requests](#in-all-merge-requests-show-only-one-file- To temporarily change your viewing preferences for a specific merge request: 1. On the left sidebar, select **Search or go to** and find your project. -1. Select **Merge requests** and find your merge request. +1. Select **Code > Merge requests** and find your merge request. 1. Below the merge request title, select **Changes**. 1. Select **Preferences** (**{settings}**). 1. Select or clear the **Show one file at a time** checkbox. @@ -73,7 +73,7 @@ merge requests. To view other changed files, either: You can view the changes inline: 1. On the left sidebar, select **Search or go to** and find your project. -1. Select **Merge requests** and find your merge request. +1. Select **Code > Merge requests** and find your merge request. 1. Below the title, select **Changes**. 1. Select **Preferences** (**{settings}**). 1. In the **Compare changes** area, select **Inline**. @@ -88,7 +88,7 @@ Depending on the length of the changes in your merge request, you might find it easier to view the changes inline, or side-by-side: 1. On the left sidebar, select **Search or go to** and find your project. -1. Select **Merge requests** and find your merge request. +1. Select **Code > Merge requests** and find your merge request. 1. Below the title, select **Changes**. 1. Select **Preferences** (**{settings}**). 1. In the **Compare changes** area, select **Side-by-side**. @@ -102,7 +102,7 @@ The changes are displayed across from one another. When reviewing code changes, you can hide inline comments: 1. On the left sidebar, select **Search or go to** and find your project. -1. Select **Merge requests** and find your merge request. +1. Select **Code > Merge requests** and find your merge request. 1. Below the title, select **Changes**. 1. Scroll to the file that contains the comments you want to hide. 1. Scroll to the line the comment is attached to, and select **Collapse** (**{collapse}**): @@ -111,7 +111,7 @@ When reviewing code changes, you can hide inline comments: To expand inline comments and show them again: 1. On the left sidebar, select **Search or go to** and find your project. -1. Select **Merge requests** and find your merge request. +1. Select **Code > Merge requests** and find your merge request. 1. Below the title, select **Changes**. 1. Scroll to the file that contains the collapsed comments you want to show. 1. Scroll to the line the comment is attached to, and select the user avatar: @@ -123,7 +123,7 @@ Whitespace changes can make it more difficult to see the substantive changes in a merge request. You can choose to hide or show whitespace changes: 1. On the left sidebar, select **Search or go to** and find your project. -1. Select **Merge requests** and find your merge request. +1. Select **Code > Merge requests** and find your merge request. 1. Below the title, select **Changes**. 1. Before the list of changed files, select **Preferences** (**{settings}**). 1. Select or clear the **Show whitespace changes** checkbox: @@ -139,7 +139,7 @@ When reviewing a merge request with many files multiple times, you can ignore fi you've already reviewed. To hide files that haven't changed since your last review: 1. On the left sidebar, select **Search or go to** and find your project. -1. Select **Merge requests** and find your merge request. +1. Select **Code > Merge requests** and find your merge request. 1. Below the title, select **Changes**. 1. In the file's header, select the **Viewed** checkbox. diff --git a/doc/user/project/merge_requests/confidential.md b/doc/user/project/merge_requests/confidential.md index 72fa836e60c316b9722fa8c0c95fff4b9000e975..1067beef90953c111d3fcf89333332236921c5e2 100644 --- a/doc/user/project/merge_requests/confidential.md +++ b/doc/user/project/merge_requests/confidential.md @@ -46,7 +46,7 @@ Prerequisites: To create a confidential merge request: 1. On the left sidebar, select **Search or go to** and find your project. -1. Select **Issues** and find the issue you want to create a merge request for. +1. Select **Plan > Issues** and find the issue you want to create a merge request for. 1. Scroll below the issue description, and select **Create confidential merge request**. 1. Select the item that meets your needs: - *To create both a branch and a merge request,* select diff --git a/doc/user/project/merge_requests/conflicts.md b/doc/user/project/merge_requests/conflicts.md index f3fd38bdcefb3579636769d375df526f059329dd..53d1269a940f362ead4a06d18fdf774ecab93918 100644 --- a/doc/user/project/merge_requests/conflicts.md +++ b/doc/user/project/merge_requests/conflicts.md @@ -106,7 +106,7 @@ resolve their conflicts. The merge conflict resolution editor helps you resolve these complex conflicts in the GitLab interface: 1. On the left sidebar, select **Search or go to** and find your project. -1. Select **Merge requests** and find the merge request. +1. Select **Code > Merge requests** and find the merge request. 1. Select **Overview**, and scroll to the merge request reports section. 1. Find the merge conflicts message, and select **Resolve conflicts**. GitLab shows a list of files with merge conflicts. diff --git a/doc/user/project/merge_requests/creating_merge_requests.md b/doc/user/project/merge_requests/creating_merge_requests.md index 85874692725a95c513ec9a61c78d598960bc13be..951c848dee1d17d3aeeb7015680bd3358728c8ca 100644 --- a/doc/user/project/merge_requests/creating_merge_requests.md +++ b/doc/user/project/merge_requests/creating_merge_requests.md @@ -45,7 +45,7 @@ After merging the merge request, the issue is closed automatically, unless To create a branch and a merge request at the same time: 1. On the left sidebar, select **Search or go to** and find your project. -1. Select **Issues** and find your issue. +1. Select **Plan > Issues** and find your issue. 1. Go to the bottom of the issue description. 1. Select **Create merge request > Create merge request and branch**. 1. In the dialog, review the suggested branch name. It's based on your project's diff --git a/doc/user/project/repository/signed_commits/index.md b/doc/user/project/repository/signed_commits/index.md index 297ae31048e89129c781c4beb5cbd43b9078b165..cbea5e4e2f5f6149156a1e25facb6e127d6b79ef 100644 --- a/doc/user/project/repository/signed_commits/index.md +++ b/doc/user/project/repository/signed_commits/index.md @@ -28,7 +28,7 @@ they are signed. 1. To review commits: - For a project, select **Code > Commits**. - For a merge request: - 1. Select **Merge requests**, then select your merge request. + 1. Select **Code > Merge requests**, then select your merge request. 1. Select **Commits**. 1. Identify the commit you want to review. Signed commits show either a **Verified** or **Unverified** badge, depending on the verification status of the signature.