diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-24 00:08:51 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-24 00:08:51 +0000 |
| commit | 1ce6af4aad0107b6d604f89a3c0b530476a10165 (patch) | |
| tree | 4956b0d395cd9232bca14f83daca3cd8616cc842 /doc/integration | |
| parent | 24256212ea84e6fb6509f6fb317a2d2bac3d0d06 (diff) | |
| download | gitlab-ce-1ce6af4aad0107b6d604f89a3c0b530476a10165.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/integration')
| -rw-r--r-- | doc/integration/github.md | 4 | ||||
| -rw-r--r-- | doc/integration/saml.md | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/integration/github.md b/doc/integration/github.md index f2eab0cdf98..269f3aa0f19 100644 --- a/doc/integration/github.md +++ b/doc/integration/github.md @@ -59,7 +59,7 @@ Follow these steps to incorporate the GitHub OAuth 2 app in your GitLab server: **Replace `https://github.example.com/` with your GitHub URL.** -1. Save the file and [reconfigure](../administration/restart_gitlab.html#omnibus-gitlab-reconfigure) GitLab for the changes to take effect. +1. Save the file and [reconfigure](../administration/restart_gitlab.md#omnibus-gitlab-reconfigure) GitLab for the changes to take effect. --- @@ -86,7 +86,7 @@ Follow these steps to incorporate the GitHub OAuth 2 app in your GitLab server: **Replace `https://github.example.com/` with your GitHub URL.** -1. Save the file and [restart](../administration/restart_gitlab.html#installations-from-source) GitLab for the changes to take effect. +1. Save the file and [restart](../administration/restart_gitlab.md#installations-from-source) GitLab for the changes to take effect. --- diff --git a/doc/integration/saml.md b/doc/integration/saml.md index aa8e29637cc..261fe6e8c18 100644 --- a/doc/integration/saml.md +++ b/doc/integration/saml.md @@ -549,7 +549,7 @@ GitLab will sign the request with the provided private key. GitLab will include If you need to troubleshoot, [a complete GitLab+SAML testing environment using Docker compose](https://gitlab.com/gitlab-com/support/toolbox/replication/tree/master/compose_files) is available. -If you only need a SAML provider for testing, a [quick start guide to start a Docker container](../administration/troubleshooting/test_environments.html#saml) with a plug and play SAML 2.0 Identity Provider (IdP) is available. +If you only need a SAML provider for testing, a [quick start guide to start a Docker container](../administration/troubleshooting/test_environments.md#saml) with a plug and play SAML 2.0 Identity Provider (IdP) is available. ### 500 error after login |