diff options
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/application_security/sast/index.md | 4 | ||||
| -rw-r--r-- | doc/user/project/members/share_project_with_groups.md | 2 | ||||
| -rw-r--r-- | doc/user/project/merge_requests/index.md | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/doc/user/application_security/sast/index.md b/doc/user/application_security/sast/index.md index cddd6a1f14d..da275c283f6 100644 --- a/doc/user/application_security/sast/index.md +++ b/doc/user/application_security/sast/index.md @@ -266,10 +266,6 @@ were introduced by the changes made in the merge request. > - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/10959) in GitLab 16.6 with a [flag](../../../administration/feature_flags.md) named `sast_reports_in_inline_diff`. Disabled by default. > - Enabled by default in GitLab 16.8. -FLAG: -On self-managed GitLab, by default this feature is not available. To make it available, an administrator can [enable the feature flag](../../../administration/feature_flags.md) named `sast_reports_in_inline_diff`. -On GitLab.com, this feature is available. - SAST results display in the merge request **Changes** view. Lines containing SAST issues are marked by a symbol beside the gutter. Select the symbol to see the list of issues, then select an issue to see its details. diff --git a/doc/user/project/members/share_project_with_groups.md b/doc/user/project/members/share_project_with_groups.md index 38cf2403841..71b960b15f8 100644 --- a/doc/user/project/members/share_project_with_groups.md +++ b/doc/user/project/members/share_project_with_groups.md @@ -39,7 +39,7 @@ In addition: - An _internal_ group to a _public_ project. - A _public_ group to a _public_ project. -- If a group in the project's hierarchy [does not allow sub-projects to be shared with groups](../../group/access_and_permissions.md#prevent-a-project-from-being-shared-with-groups), the option to **Invite a group** is not available. +- If a group in the project's hierarchy [does not allow projects to be shared with groups](../../group/access_and_permissions.md#prevent-a-project-from-being-shared-with-groups), the option to **Invite a group** is not available. - If the project's root ancestor group [does not allow the project to be shared outside the hierarchy](../../group/access_and_permissions.md#prevent-group-sharing-outside-the-group-hierarchy), the invited group or subgroup must be in the project's [namespace](../../namespace/index.md). For example, a project in the namespace `group/subgroup01/project`: - Can be shared with `group/subgroup02` or `group/subgroup01/subgroup03`. diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md index 3555d9ffa01..dece5600b0d 100644 --- a/doc/user/project/merge_requests/index.md +++ b/doc/user/project/merge_requests/index.md @@ -82,6 +82,7 @@ or: > - Filtering by potential approvers was moved to GitLab Premium in 13.9. > - Filtering by `approved-by` moved to GitLab Premium in 13.9. > - Filtering by `source-branch` [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/134555) in GitLab 16.6. +> - Filtering by `merged-by` [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/140002) in GitLab 16.9. Available only when the feature flag `mr_merge_user_filter` is enabled. To filter the list of merge requests: @@ -95,6 +96,7 @@ To filter the list of merge requests: - **Approved-By**, for merge requests already approved by a user. **(PREMIUM ALL)**. - **Approver**, for merge requests that this user is eligible to approve. (For more information, read about [Code owners](../codeowners/index.md)). **(PREMIUM ALL)** + - **Merged-By**, for merge requests merged by this user. - **Reviewer**, for merge requests reviewed by this user. 1. Select or type the operator to use for filtering the attribute. The following operators are available: |