diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-15 15:08:59 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-15 15:08:59 +0000 |
| commit | 0ac82f99553ce12009970a14c0afc02d1f6515bb (patch) | |
| tree | 6a8b27824055c36527211382d7d90497f40ee395 | |
| parent | 4c8b21b315f3454aec254dba4eeb0bfcb75e82a5 (diff) | |
| download | gitlab-ce-0ac82f99553ce12009970a14c0afc02d1f6515bb.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
| -rw-r--r-- | changelogs/unreleased/xanf-prohibit-outer-forks.yml | 5 | ||||
| -rw-r--r-- | locale/gitlab.pot | 12 |
2 files changed, 17 insertions, 0 deletions
diff --git a/changelogs/unreleased/xanf-prohibit-outer-forks.yml b/changelogs/unreleased/xanf-prohibit-outer-forks.yml new file mode 100644 index 00000000000..24cad25514b --- /dev/null +++ b/changelogs/unreleased/xanf-prohibit-outer-forks.yml @@ -0,0 +1,5 @@ +--- +title: Added "Prohibit outer fork" setting for Group SAML +merge_request: 25246 +author: +type: added diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 074c74e41cb..75ed5c04472 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -9678,6 +9678,12 @@ msgstr "" msgid "GroupSAML|NameID Format" msgstr "" +msgid "GroupSAML|Prohibit outer forks" +msgstr "" + +msgid "GroupSAML|Prohibit outer forks for this group." +msgstr "" + msgid "GroupSAML|SAML Response Output" msgstr "" @@ -9708,6 +9714,9 @@ msgstr "" msgid "GroupSAML|To be able to enable group managed accounts, you first need to enable enforced SSO." msgstr "" +msgid "GroupSAML|To be able to prohibit outer forks, you first need to enforce dedicate group managed accounts." +msgstr "" + msgid "GroupSAML|Toggle SAML authentication" msgstr "" @@ -9717,6 +9726,9 @@ msgstr "" msgid "GroupSAML|With group managed accounts enabled, all the users without a group managed account will be excluded from the group." msgstr "" +msgid "GroupSAML|With prohibit outer forks flag enabled group members will be able to fork project only inside your group." +msgstr "" + msgid "GroupSAML|Your SCIM token" msgstr "" |