Add latest changes from gitlab-org/gitlab@12-10-stable-ee

3 files changed, 34 insertions, 8 deletions

diff --git a/doc/user/group/img/group_activity_analytics_v12_10.png b/doc/user/group/img/group_activity_analytics_v12_10.png
new file mode 100644
index 00000000000..e49594c155b
--- /dev/null
+++ b/doc/user/group/img/group_activity_analytics_v12_10.png
diff --git a/doc/user/group/index.md b/doc/user/group/index.md
index fdcc4105620..b819e3e971e 100644
--- a/doc/user/group/index.md
+++ b/doc/user/group/index.md
@@ -226,16 +226,42 @@ To change this setting for a specific group:
 
 To change this setting globally, see [Default project creation protection](../admin_area/settings/visibility_and_access_controls.md#default-project-creation-protection).
 
-## Viewing group activity
+## View group details
+
+A group's **Details** page includes tabs for:
+
+- Subgroups and projects.
+- Shared projects.
+- Archived projects.
+
+### Group activity analytics overview
+
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/207164) in GitLab [Starter](https://about.gitlab.com/pricing/) 12.10 as
+a [beta feature](https://about.gitlab.com/handbook/product/#beta)
+
+The group details view also shows the number of the following items created in the last 90 days: **(STARTER)**
+
+- Merge requests.
+- Issues.
+- Members.
+
+These Group Activity Analytics can be enabled with the `group_activity_analytics` [feature flag](../../development/feature_flags/development.md#enabling-a-feature-flag-in-development).
+
+![Recent Group Activity](img/group_activity_analytics_v12_10.png)
+
+For details, see the section on how you can [View group activity](#view-group-activity).
+
+## View group activity
 
 A group's **Activity** page displays the most recent actions taken in a group, including:
 
-- **Push events**: Recent pushes to branches
-- **Merge events**: Recent merges
-- **Issue events**: Issues opened or closed
-- **Epic events**: Epics opened or closed
-- **Comments**: Comments opened or closed
-- **Team**: Team members who have joined or left the group
+- **Push events**: Recent pushes to branches.
+- **Merge events**: Recent merges.
+- **Issue events**: Issues opened or closed.
+- **Epic events**: Epics opened or closed.
+- **Comments**: Comments opened or closed.
+- **Team**: Team members who have joined or left the group.
+- **Wiki**: Wikis created, deleted, or updated.
 
 The entire activity feed is also available in Atom format by clicking the
 **RSS** icon.
diff --git a/doc/user/group/saml_sso/index.md b/doc/user/group/saml_sso/index.md
index e78a894d987..f49dd225146 100644
--- a/doc/user/group/saml_sso/index.md
+++ b/doc/user/group/saml_sso/index.md
@@ -242,7 +242,7 @@ For a demo of the Azure SAML setup including SCIM, see [SCIM Provisioning on Azu
 |--------------|----------------|
 | Identifier   | Identifier (Entity ID) |
 | Assertion consumer service URL | Reply URL (Assertion Consumer Service URL) |
-| Identity provider single sign on URL | Login URL |
+| Identity provider single sign on URL | Sign on URL |
 | Certificate fingerprint | Thumbprint |
 
 We recommend: