diff --git a/doc/user/ai_features.md b/doc/user/ai_features.md index 6fb9e5ba250f643fdd7335586afa3025e1526430..ac1de01918ef3a24aaca42d5c977a43700a6cdc6 100644 --- a/doc/user/ai_features.md +++ b/doc/user/ai_features.md @@ -207,7 +207,7 @@ GPT-3. It requires the [group-level third-party AI features setting](group/manag You can generate a summary of discussions on an issue: 1. In an issue, scroll to the **Activity** section. -1. Select **View summary** (**{comment}**). +1. Select **View summary**. The comments in the issue are summarized in as many as 10 list items. The summary is displayed only for you. diff --git a/doc/user/discussions/img/reply_to_comment_button.png b/doc/user/discussions/img/reply_to_comment_button.png deleted file mode 100644 index d327d1c3e27b646ec5675ffbe8c9f221161b1896..0000000000000000000000000000000000000000 Binary files a/doc/user/discussions/img/reply_to_comment_button.png and /dev/null differ diff --git a/doc/user/discussions/index.md b/doc/user/discussions/index.md index c5fd38ba3e3e0aa8935709c1df2cdda3699391de..f603354198679ce66d52ff5ff5827d6ca75e874b 100644 --- a/doc/user/discussions/index.md +++ b/doc/user/discussions/index.md @@ -213,8 +213,6 @@ To compare the changes, select **Compare with previous version**. ## Assign an issue to the commenting user -> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/191455) in GitLab 13.1. - You can assign an issue to a user who made a comment. 1. In the comment, select the **More Actions** (**{ellipsis_v}**) menu. @@ -233,9 +231,7 @@ Prerequisites: To create a thread by replying to a comment: -1. In the upper-right corner of the comment, select **Reply to comment** (**{comment}**). - -  +1. In the upper-right corner of the comment, select **Reply to comment** (**{reply}**). The reply section is displayed. diff --git a/doc/user/project/merge_requests/changes.md b/doc/user/project/merge_requests/changes.md index e6e4a58d39f0b40b1b504c0f508314eb3a1f515a..3c60d78f84f9c772bbcda228bcf63c8041b1dd10 100644 --- a/doc/user/project/merge_requests/changes.md +++ b/doc/user/project/merge_requests/changes.md @@ -27,23 +27,17 @@ To view the diff of changes included in a merge request: 1. Select the file you want to view. 1. To hide the file browser, select **Show file browser** again. -In [GitLab 13.4](https://gitlab.com/gitlab-org/gitlab/-/issues/232820) and later, files -with many changes are collapsed to improve performance. GitLab displays the message: +Files with many changes are collapsed to improve performance. GitLab displays the message: **Some changes are not shown**. To view the changes for that file, select **Expand file**. ## Show one file at a time -> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/222790) in GitLab 13.2. -> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/229848) in GitLab 13.7. - For larger merge requests, you can review one file at a time. You can change this setting [temporarily in a merge request](#in-a-merge-request-show-only-one-file-at-a-time), or so it [applies to all merge requests](#in-all-merge-requests-show-only-one-file-at-a-time). ### In a merge request, show only one file at a time -> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/233898) in GitLab 13.7. - To temporarily change your viewing preferences for a specific merge request: 1. Go to your merge request, and below the merge request title, select **Changes**. @@ -161,7 +155,7 @@ On GitLab.com, this feature is not available. You can add comments to a merge request diff file. These comments persist across rebases and file changes. -To add a comment a merge request file: +To add a comment to a merge request file: 1. On the top bar, select **Main menu > Projects** and find your project. 1. On the left sidebar, select **Settings > Merge requests** and find your merge request. diff --git a/doc/user/project/merge_requests/reviews/index.md b/doc/user/project/merge_requests/reviews/index.md index 65042da48e4d7978aab3d7bbb682ce8616ae420a..66b1d792391febb379b75ef7d1893b6b0fc2b498 100644 --- a/doc/user/project/merge_requests/reviews/index.md +++ b/doc/user/project/merge_requests/reviews/index.md @@ -7,9 +7,6 @@ type: index, reference # Merge request reviews **(FREE)** -> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/216054) in GitLab 13.5. -> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/245190) in GitLab 13.9. - [Merge requests](../index.md) are the primary method of making changes to files in a GitLab project. [Create and submit a merge request](../creating_merge_requests.md) to propose changes. Your team leaves [comments](../../../discussions/index.md) on @@ -52,9 +49,6 @@ of a merge request with new commits. ## Review a merge request -> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/4213) in GitLab 11.4. -> - [Moved](https://gitlab.com/gitlab-org/gitlab/-/issues/28154) from GitLab Premium to GitLab Free in 13.1. - When you review a merge request, you can create comments that are visible only to you. When you're ready, you can publish them together in a single action. To start your review: @@ -62,7 +56,7 @@ To start your review: 1. Go to the merge request you want to review, and select the **Changes** tab. For more information about navigating the diffs displayed in this tab, see [Changes in merge requests](../changes.md). -1. Select the **{comment}** **comment** icon in the gutter to expand the diff lines +1. Select **Add a comment to this line** (**{comment}**) in the gutter to expand the diff lines and display a comment box. In GitLab version 13.2 and later, you can [select multiple lines](#comment-on-multiple-lines). 1. In the text area, write your first comment, then select **Start a review** below your comment. @@ -75,8 +69,7 @@ To start your review: are now visible, and any [quick actions](../../quick_actions.md) included in your comments are performed. -[In GitLab 13.10 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/292936), -if you [approve a merge request](../approvals/index.md#approve-a-merge-request) and +If you [approve a merge request](../approvals/index.md#approve-a-merge-request) and are shown in the reviewer list, a green check mark **{check-circle-filled}** displays next to your name. @@ -161,8 +154,6 @@ Pending comments display information about the action to be taken when the comme ### Add a new comment -> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/8225) in GitLab 13.10. - If you have a review in progress, you can also add a comment from the **Overview** tab by selecting **Add to review**: @@ -170,9 +161,6 @@ If you have a review in progress, you can also add a comment from the **Overview ### Approval Rule information for Reviewers **(PREMIUM)** -> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/233736) in GitLab 13.8. -> - [Feature flag `reviewer_approval_rules` removed](https://gitlab.com/gitlab-org/gitlab/-/issues/293742) in GitLab 13.9. - When editing the **Reviewers** field in a new or existing merge request, GitLab displays the name of the matching [approval rule](../approvals/rules.md) below the name of each suggested reviewer. [Code Owners](../../codeowners/index.md) are displayed as `Codeowner` without group detail. @@ -187,8 +175,6 @@ This example shows reviewers and approval rules in a merge request sidebar: ### Request a new review -> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/293933) in GitLab 13.9. - After a reviewer completes their [merge request reviews](../../../discussions/index.md), the author of the merge request can request a new review from the reviewer: @@ -202,18 +188,14 @@ them a notification email. ## Comment on multiple lines -> - [Introduced](https://gitlab.com/gitlab-org/ux-research/-/issues/870) in GitLab 13.2. -> - [Added](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49875) select-and-drag features in GitLab 13.8. -> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/299121) in GitLab 13.9. - When commenting on a diff, you can select which lines of code your comment refers to by either:  -- Dragging the **{comment}** **comment** icon in the gutter to highlight +- Dragging **Add a comment to this line** (**{comment}**) in the gutter to highlight lines in the diff. GitLab expands the diff lines and displays a comment box. -- After starting a comment by selecting the **{comment}** **comment** icon in the +- After starting a comment by selecting **Add a comment to this line** (**{comment}**) in the gutter, select the first line number your comment refers to in the **Commenting on lines** select box. New comments default to single-line comments, unless you select a different starting line. @@ -245,8 +227,6 @@ To update multiple project merge requests at the same time: ## Bulk edit merge requests at the group level **(PREMIUM)** -> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/12719) in GitLab 12.2. - Users with at least the Developer role can manage merge requests. When bulk editing merge requests in a group, you can edit the following attributes: @@ -315,8 +295,6 @@ the command line. ### Copy the branch name for local checkout -> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/23767) in GitLab 13.4. - The merge request sidebar contains the branch reference for the source branch used to contribute changes for this merge request. @@ -418,9 +396,6 @@ All the above can be done with the [`git-mr`](https://gitlab.com/glensc/git-mr) ## Cached merge request count -> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/299542) in GitLab 13.11. -> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/327319) in GitLab 14.0. - In a group, the sidebar displays the total count of open merge requests. This value is cached if it's greater than than 1000. The cached value is rounded to thousands (or millions) and updated every 24 hours.