Add latest changes from gitlab-org/gitlab@master

8 files changed, 8 insertions, 4 deletions

diff --git a/doc/user/analytics/cycle_analytics.md b/doc/user/analytics/cycle_analytics.md
index 8d3eaade759..04897f0fc8a 100644
--- a/doc/user/analytics/cycle_analytics.md
+++ b/doc/user/analytics/cycle_analytics.md
@@ -183,7 +183,7 @@ Feature.disable(:cycle_analytics_scatterplot_enabled)
 
 ### Disabling chart median line
 
-This chart median line is enabled by default. If you have a self-managed instance, an
+This chart's median line is enabled by default. If you have a self-managed instance, an
 administrator can open a Rails console and disable it with the following command:
 
 ```ruby
diff --git a/doc/user/group/saml_sso/index.md b/doc/user/group/saml_sso/index.md
index e0028e7124d..99749ccf2ae 100644
--- a/doc/user/group/saml_sso/index.md
+++ b/doc/user/group/saml_sso/index.md
@@ -265,6 +265,10 @@ Specific attention should be paid to:
 - The presence of a `X509Certificate`, which we require to verify the response signature.
 - The `SubjectConfirmation` and `Conditions`, which can cause errors if misconfigured.
 
+### Verifying configuration
+
+For convenience, we've included some [example resources](../../../administration/troubleshooting/group_saml_scim.md) used by our Support Team. While they may help you verify the SAML app configuration, they are not guaranteed to reflect the current state of third-party products.
+
 ### Verifying NameID
 
 In troubleshooting the Group SAML setup, any authenticated user can use the API to verify the NameID GitLab already has linked to the user by visiting [https://gitlab.com/api/v4/user](https://gitlab.com/api/v4/user) and checking the `extern_uid` under identities.
diff --git a/doc/user/profile/img/notification_group_settings.png b/doc/user/profile/img/notification_group_settings.png
deleted file mode 100644
index ed5e9459216..00000000000
--- a/doc/user/profile/img/notification_group_settings.png
+++ /dev/null
diff --git a/doc/user/profile/img/notification_group_settings_v12_8.png b/doc/user/profile/img/notification_group_settings_v12_8.png
new file mode 100644
index 00000000000..4aa4c32a260
--- /dev/null
+++ b/doc/user/profile/img/notification_group_settings_v12_8.png
diff --git a/doc/user/profile/img/notification_project_settings.png b/doc/user/profile/img/notification_project_settings.png
deleted file mode 100644
index e2db2037d94..00000000000
--- a/doc/user/profile/img/notification_project_settings.png
+++ /dev/null
diff --git a/doc/user/profile/img/notification_project_settings_v12_8.png b/doc/user/profile/img/notification_project_settings_v12_8.png
new file mode 100644
index 00000000000..9b8837a4ef4
--- /dev/null
+++ b/doc/user/profile/img/notification_project_settings_v12_8.png
diff --git a/doc/user/profile/notifications.md b/doc/user/profile/notifications.md
index 42ed3fb36a2..d3444b9aa13 100644
--- a/doc/user/profile/notifications.md
+++ b/doc/user/profile/notifications.md
@@ -68,7 +68,7 @@ Notification scope is applied in order of precedence (highest to lowest):
 
 You can select a notification level for each project. This can be useful if you need to closely monitor activity in select projects.
 
-![notification settings](img/notification_project_settings.png)
+![notification settings](img/notification_project_settings_v12_8.png)
 
 To select a notification level for a project, use either of these methods:
 
@@ -87,7 +87,7 @@ Or:
 
 You can select a notification level and email address for each group.
 
-![notification settings](img/notification_group_settings.png)
+![notification settings](img/notification_group_settings_v12_8.png)
 
 ##### Group notification level
 
diff --git a/doc/user/project/import/github.md b/doc/user/project/import/github.md
index b8e774c57a1..175110cd535 100644
--- a/doc/user/project/import/github.md
+++ b/doc/user/project/import/github.md
@@ -42,7 +42,7 @@ assignees in the database of the GitLab instance (note that pull requests are ca
 
 For this association to succeed, prior to the import, each GitHub author and assignee in the repository must
 have either previously logged in to a GitLab account using the GitHub icon **or** have a GitHub account with
-a [public email address](https://help.github.com/en/github/setting-up-and-managing-your-github-user-account/setting-your-commit-email-address) that
+a [primary email address](https://help.github.com/en/github/setting-up-and-managing-your-github-user-account/setting-your-commit-email-address) that
 matches their GitLab account's email address.
 
 If a user referenced in the project is not found in GitLab's database, the project creator (typically the user