Commit 0126840f authored by Evan Read's avatar Evan Read

Merge branch 'selhorn-groups-end' into 'master'

Last edits and bug fixes

See merge request gitlab-org/gitlab!55898
parents e2dcd5e2 f277f4cb
...@@ -430,30 +430,26 @@ To restore a group that is marked for deletion: ...@@ -430,30 +430,26 @@ To restore a group that is marked for deletion:
Prevent projects in a group from [sharing Prevent projects in a group from [sharing
a project with another group](../project/members/share_project_with_groups.md) to enable tighter control over project access. a project with another group](../project/members/share_project_with_groups.md) to enable tighter control over project access.
For example, let's say you have two distinct teams (Group A and Group B) working together in a project, and to inherit the group membership, you share the project between the To prevent a project from being shared with other groups:
two groups A and B. **Share with group lock** prevents any project in
the group from being shared with another group,
guaranteeing that only the right group members have access to those projects.
To prevent a project from being shared with groups:
1. Go to the group's **Settings > General** page. 1. Go to the group's **Settings > General** page.
1. Select **Share with group lock**. 1. Expand the **Permissions, LFS, 2FA** section.
1. Select **Save the group**. 1. Select **Prevent sharing a project within <group_name> with other groups**.
1. Select **Save changes**.
## Prevent members from being added to a group **(PREMIUM)** ## Prevent members from being added to a group **(PREMIUM)**
Member lock lets a group owner prevent any new project membership to all of the As a group owner, you can prevent any new project membership for all
projects in a group, allowing tighter control over project membership. projects in a group, allowing tighter control over project membership.
For example, if you want to lock the group for an [Audit Event](../../administration/audit_events.md), For example, if you want to lock the group for an [Audit Event](../../administration/audit_events.md),
enable member lock to guarantee that project membership cannot be modified during the audit. you can guarantee that project membership cannot be modified during the audit.
To prevent members from being added to a group: To prevent members from being added to a group:
1. Go to the group's **Settings > General** page. 1. Go to the group's **Settings > General** page.
1. Expand the **Permissions, LFS, 2FA** section. 1. Expand the **Permissions, LFS, 2FA** section.
1. Select **Member lock**. 1. Under **Member lock**, select **Prevent adding new members to project membership within this group**.
1. Select **Save changes**. 1. Select **Save changes**.
All users who previously had permissions can no longer add members to a group. All users who previously had permissions can no longer add members to a group.
...@@ -470,29 +466,24 @@ users cannot perform Git operations through SSH, or access projects in the UI. ...@@ -470,29 +466,24 @@ users cannot perform Git operations through SSH, or access projects in the UI.
For more information, [see this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/271673). For more information, [see this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/271673).
To ensure only people from your organization can access particular To ensure only people from your organization can access particular
resources, you can restrict access to groups and their resources, you can restrict access to groups by IP address. This setting applies to all subgroups,
underlying subgroups, projects, issues, and so on, by IP address. This can help ensure that projects, issues, and so on.
particular content doesn't leave the premises, while not blocking off access to
the entire instance. IP access restrictions can only be configured at the group level.
Add one or more allowed IP subnets using CIDR notation to the group settings and anyone IP access restrictions can be configured at the group level only.
coming from a different IP address won't be able to access the restricted
content.
Restriction currently applies to: This restriction applies to:
- UI. - The GitLab UI.
- [From GitLab 12.3](https://gitlab.com/gitlab-org/gitlab/-/issues/12874), API access. - [In GitLab 12.3 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/12874), the API.
- [From GitLab 12.4](https://gitlab.com/gitlab-org/gitlab/-/issues/32113), Git actions via SSH. - [In GitLab 12.4 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/32113), Git actions via SSH.
To avoid accidental lock-out, admins and group owners are able to access Administrators and group owners are able to access the group regardless of the IP restriction.
the group regardless of the IP restriction.
To restrict group access by IP address: To restrict group access by IP address:
1. Go to the group’s **Settings > General** page. 1. Go to the group’s **Settings > General** page.
1. Expand the **Permissions, LFS, 2FA** section. 1. Expand the **Permissions, LFS, 2FA** section.
1. In the **Allow access to the following IP addresses** field, enter IP address ranges. 1. In the **Allow access to the following IP addresses** field, enter IP address ranges in CIDR notation.
1. Select **Save changes**. 1. Select **Save changes**.
![Domain restriction by IP address](img/restrict-by-ip.gif) ![Domain restriction by IP address](img/restrict-by-ip.gif)
...@@ -540,20 +531,20 @@ You can configure this feature for both subgroups and immediate parent groups. A ...@@ -540,20 +531,20 @@ You can configure this feature for both subgroups and immediate parent groups. A
in a subgroup has access to the templates for that subgroup, as well as in a subgroup has access to the templates for that subgroup, as well as
any immediate parent groups. any immediate parent groups.
To enable group file templates:
1. Go to the group settings page.
1. Expand the **Templates** section.
1. Choose a project to act as the template repository.
1. Select **Save group**.
To learn how to create templates for issues and merge requests, see To learn how to create templates for issues and merge requests, see
[Description templates](../project/description_templates.md). [Description templates](../project/description_templates.md).
### Group-level project templates **(PREMIUM)**
Define project templates at a group level by setting a group as the template source. Define project templates at a group level by setting a group as the template source.
[Learn more about group-level project templates](custom_project_templates.md). [Learn more about group-level project templates](custom_project_templates.md). **(PREMIUM)**
### Enable group file template **(PREMIUM)**
To enable group file templates:
1. Go to the group's **Settings > General** page.
1. Expand the **Templates** section.
1. Choose a project to act as the template repository.
1. Select **Save changes**.
## Disable email notifications ## Disable email notifications
...@@ -616,7 +607,8 @@ Optionally, on [Premium](https://about.gitlab.com/pricing/) or higher tiers, ...@@ -616,7 +607,8 @@ Optionally, on [Premium](https://about.gitlab.com/pricing/) or higher tiers,
you can prevent the projects in a group from being forked outside of the current top-level group. you can prevent the projects in a group from being forked outside of the current top-level group.
Previously this setting was available only for groups enforcing group managed account. This setting will be Previously this setting was available only for groups enforcing group managed account. This setting will be
removed from SAML setting page and migrated to group setting, but in the interim period of changes both of those settings will be taken into consideration, if even one is set to `true` then it will be assumed group does not allow forking projects outside. removed from SAML setting page and migrated to group settings. In the interim period, both of these settings are taken into consideration.
If even one is set to `true` then it will be assumed the group does not allow forking projects outside.
To enable prevent project forking: To enable prevent project forking:
...@@ -647,8 +639,7 @@ The group's new subgroups have push rules set for them based on either: ...@@ -647,8 +639,7 @@ The group's new subgroups have push rules set for them based on either:
## Related topics ## Related topics
- [Maximum artifacts size](../admin_area/settings/continuous_integration.md#maximum-artifacts-size). **(FREE SELF)** - [Maximum artifacts size](../admin_area/settings/continuous_integration.md#maximum-artifacts-size). **(FREE SELF)**
- [Repositories analytics](repositories_analytics/index.md): View overall activity of all projects with code coverage. - [Repositories analytics](repositories_analytics/index.md): View overall activity of all projects with code coverage. **(PREMIUM)**
[Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/263478) in GitLab 13.6. **(PREMIUM)**
- [Contribution analytics](contribution_analytics/index.md): View the contributions (pushes, merge requests, - [Contribution analytics](contribution_analytics/index.md): View the contributions (pushes, merge requests,
and issues) of group members. **(PREMIUM)** and issues) of group members. **(PREMIUM)**
- [Issue analytics](issues_analytics/index.md): View a bar chart of your group's number of issues per month. **(PREMIUM)** - [Issue analytics](issues_analytics/index.md): View a bar chart of your group's number of issues per month. **(PREMIUM)**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment