diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-29 14:12:35 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-29 14:12:57 +0000 |
| commit | 5c4639afa1f53d7ed6f682168fda0b491c16e844 (patch) | |
| tree | f454150a7af9335323276ba08097b43e62fd0dab | |
| parent | 451b22ae6be7923933c9de561ef06e1124649bc0 (diff) | |
| download | gitlab-ce-5c4639afa1f53d7ed6f682168fda0b491c16e844.tar.gz | |
Add latest changes from gitlab-org/security/gitlab@15-1-stable-ee
| -rw-r--r-- | .rubocop_todo/layout/line_length.yml | 1 | ||||
| -rw-r--r-- | doc/user/group/index.md | 3 | ||||
| -rw-r--r-- | locale/gitlab.pot | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml index 16d22183345..6315f5dd28b 100644 --- a/.rubocop_todo/layout/line_length.yml +++ b/.rubocop_todo/layout/line_length.yml @@ -1960,7 +1960,6 @@ Layout/LineLength: - 'ee/spec/features/groups/iterations/user_edits_iteration_spec.rb' - 'ee/spec/features/groups/iterations/user_views_iteration_cadence_spec.rb' - 'ee/spec/features/groups/iterations/user_views_iteration_spec.rb' - - 'ee/spec/features/groups/members/manage_groups_spec.rb' - 'ee/spec/features/groups/members/manage_members_spec.rb' - 'ee/spec/features/groups/members/override_ldap_memberships_spec.rb' - 'ee/spec/features/groups/saml_providers_spec.rb' diff --git a/doc/user/group/index.md b/doc/user/group/index.md index c0ae721e3b4..6ba8251ba05 100644 --- a/doc/user/group/index.md +++ b/doc/user/group/index.md @@ -648,6 +648,7 @@ at the group level. > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/7297) in GitLab 12.2. > - Support for specifying multiple email domains [added](https://gitlab.com/gitlab-org/gitlab/-/issues/33143) in GitLab 13.1. > - Support for restricting access to projects in the group [added](https://gitlab.com/gitlab-org/gitlab/-/issues/14004) in GitLab 14.1.2. +> - Support for restricting group memberships to groups with a subset of the allowed email domains [added](https://gitlab.com/gitlab-org/gitlab/-/issues/354791) in GitLab 15.0.1 You can prevent users with email addresses in specific domains from being added to a group and its projects. @@ -668,6 +669,8 @@ The most popular public email domains cannot be restricted, such as: - `hotmail.com`, `hotmail.co.uk`, `hotmail.fr` - `msn.com`, `live.com`, `outlook.com` +When you share a group, both the source and target namespaces must allow the domains of the members' email addresses. + ## Group file templates **(PREMIUM)** Use group file templates to share a set of templates for common file diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 9f19cfd563a..c859cfa2618 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -21205,6 +21205,9 @@ msgstr "" msgid "Invited" msgstr "" +msgid "Invited group allowed email domains must contain a subset of the allowed email domains of the root ancestor group. Go to the group's 'Settings > General' page and check 'Restrict membership by email domain'." +msgstr "" + msgid "IrkerService|Channels and users separated by whitespaces. %{recipients_docs_link}" msgstr "" |