diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 12:08:31 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 12:08:31 +0300 |
| commit | a76d34e6716aa8267111ecdcd21416e9dec3a08d (patch) | |
| tree | 25876a46afec0af5b0d7168addb45e743d2a2128 /doc/user/group | |
| parent | 00bd11b166a886742f04d38c0d2551e52ff51472 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/group')
| -rw-r--r-- | doc/user/group/epics/index.md | 10 | ||||
| -rw-r--r-- | doc/user/group/index.md | 2 | ||||
| -rw-r--r-- | doc/user/group/saml_sso/index.md | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/doc/user/group/epics/index.md b/doc/user/group/epics/index.md index 91d6984efc5..421a43ba818 100644 --- a/doc/user/group/epics/index.md +++ b/doc/user/group/epics/index.md @@ -156,10 +156,12 @@ These are dynamic dates which are recalculated if any of the following occur: > [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/7332) in GitLab 12.5 to replace **From milestones**. -If you select **Inherited** for the start date, GitLab will scan all child epics and issues assigned to the epic, -and will set the start date to match the earliest found start date or milestone. Similarly, if you select -**Inherited** for the due date, GitLab will set the due date to match the latest due date or milestone -found among its child epics and issues. +If you select: + +- **Inherited** for the start date, GitLab will scan all child epics and issues assigned to the epic, + and will set the start date to match the earliest found start date or milestone. +- **Inherited** for the due date, GitLab will set the due date to match the latest due date or + milestone found among its child epics and issues. These are dynamic dates and recalculated if any of the following occur: diff --git a/doc/user/group/index.md b/doc/user/group/index.md index cca82f6a4fb..1956cd97b5d 100644 --- a/doc/user/group/index.md +++ b/doc/user/group/index.md @@ -347,7 +347,7 @@ Changing a group's path can have unintended side effects. Read before proceeding. If you are vacating the path so it can be claimed by another group or user, -you may need to rename the group, too, since both names and paths must +you may need to rename the group too, since both names and paths must be unique. To change your group path: diff --git a/doc/user/group/saml_sso/index.md b/doc/user/group/saml_sso/index.md index 8aad15671e1..e81ce4c15cb 100644 --- a/doc/user/group/saml_sso/index.md +++ b/doc/user/group/saml_sso/index.md @@ -266,7 +266,7 @@ For example, to unlink the `MyOrg` account, the following **Disconnect** button | Term | Description | |------|-------------| -| Identity Provider | The service which manages your user identities such as ADFS, Okta, Onelogin or Ping Identity. | +| Identity Provider | The service which manages your user identities such as ADFS, Okta, Onelogin, or Ping Identity. | | Service Provider | SAML considers GitLab to be a service provider. | | Assertion | A piece of information about a user's identity, such as their name or role. Also know as claims or attributes. | | SSO | Single Sign On. | |