diff options
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/group/saml_sso/index.md | 10 | ||||
| -rw-r--r-- | doc/user/project/import/index.md | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/doc/user/group/saml_sso/index.md b/doc/user/group/saml_sso/index.md index 6fa7a0397f4..73ac54905e3 100644 --- a/doc/user/group/saml_sso/index.md +++ b/doc/user/group/saml_sso/index.md @@ -64,7 +64,7 @@ We intend to add a similar SSO requirement for [Git and API activity](https://gi #### Group-managed accounts -[Introduced in GitLab 12.1](https://gitlab.com/groups/gitlab-org/-/epics/709). +> [Introduced in GitLab 12.1](https://gitlab.com/groups/gitlab-org/-/epics/709). When SSO is being enforced, groups can enable an additional level of protection by enforcing the creation of dedicated user accounts to access the group. @@ -95,6 +95,14 @@ To access the Credentials inventory of a group, navigate to **{shield}** **Secur This feature is similar to the [Credentials inventory for self-managed instances](../../admin_area/credentials_inventory.md). +##### Outer forks restriction for Group-managed accounts + +> [Introduced in GitLab 12.9](https://gitlab.com/gitlab-org/gitlab/issues/34648) + +Groups with enabled group-managed accounts can allow or disallow forking of projects outside of root group +by using separate toggle. If forking is disallowed any project of given root group or its subgroups can be forked to +a subgroup of the same root group only. + #### Assertions When using group-managed accounts, the following user details need to be passed to GitLab as SAML diff --git a/doc/user/project/import/index.md b/doc/user/project/import/index.md index 571968dd065..8fd4325b5cd 100644 --- a/doc/user/project/import/index.md +++ b/doc/user/project/import/index.md @@ -49,9 +49,9 @@ Docker pulls and pushes and re-run any CI pipelines to retrieve any build artifa ## Migrating between two self-hosted GitLab instances -The best method for migrating a project from one GitLab instance to another, +The best method for migrating from one GitLab instance to another, perhaps from an old server to a new server for example, is to -[back up the project](../../../raketasks/backup_restore.md), +[back up the instance](../../../raketasks/backup_restore.md), then restore it on the new server. In the event of merging two GitLab instances together (for example, both instances have existing data on them and one can't be wiped), |