diff options
author | Marcia Ramos <marcia@gitlab.com> | 2019-03-13 15:12:40 +0000 |
---|---|---|
committer | Marcia Ramos <marcia@gitlab.com> | 2019-03-13 15:12:40 +0000 |
commit | 5902b9be458d971ce653351fc32652bc47c8d00c (patch) | |
tree | 733b33a8c32b93c0ddfd087d61295975cdba7158 | |
parent | 8a8cc9194095e4c802989b1b2d4e04e99af18c98 (diff) | |
parent | a3f0388b661f6efb120db9d26bd18b27d7776d4c (diff) | |
download | gitlab-ce-5902b9be458d971ce653351fc32652bc47c8d00c.tar.gz |
Merge branch 'docs/fix-links' into 'master'
Fix some 404ing links
See merge request gitlab-org/gitlab-ce!25789
-rw-r--r-- | doc/administration/git_protocol.md | 11 | ||||
-rw-r--r-- | doc/topics/authentication/index.md | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/doc/administration/git_protocol.md b/doc/administration/git_protocol.md index 11b2adeeeb8..345e8646f9b 100644 --- a/doc/administration/git_protocol.md +++ b/doc/administration/git_protocol.md @@ -5,13 +5,16 @@ description: "Set and configure Git protocol v2" # Configuring Git Protocol v2 > [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/46555) in GitLab 11.4. -> [Temporarily disabled](https://gitlab.com/gitlab-org/gitlab-ce/issues/55769) in GitLab 11.5.8, 11.6.6, 11.7.1, and 11.8+ +> Temporarily disabled (see [confidential issue](../user/project/issues/confidential_issues.md) +> `https://gitlab.com/gitlab-org/gitlab-ce/issues/55769`) in GitLab 11.5.8, 11.6.6, 11.7.1, and 11.8+. NOTE: **Note:** -Git protocol v2 support has been [temporarily disabled](https://gitlab.com/gitlab-org/gitlab-ce/issues/55769), -as a feature used to hide certain internal references does not function when it +Git protocol v2 support has been temporarily disabled +because a feature used to hide certain internal references does not function when it is enabled, and this has a security impact. Once this problem has been resolved, -protocol v2 support will be re-enabled. +protocol v2 support will be re-enabled. For more information, see the +[confidential issue](../user/project/issues/confidential_issues.md) +`https://gitlab.com/gitlab-org/gitlab-ce/issues/55769`. Git protocol v2 improves the v1 wire protocol in several ways and is enabled by default in GitLab for HTTP requests. In order to enable SSH, diff --git a/doc/topics/authentication/index.md b/doc/topics/authentication/index.md index eef26612d5b..0fc7f57feab 100644 --- a/doc/topics/authentication/index.md +++ b/doc/topics/authentication/index.md @@ -21,7 +21,7 @@ This page gathers all the resources for the topic **Authentication** within GitL - [Enforce Two-factor Authentication (2FA)](../../security/two_factor_authentication.md#enforce-two-factor-authentication-2fa) - **Articles:** - [How to Configure LDAP with GitLab CE](../../administration/auth/how_to_configure_ldap_gitlab_ce/index.md) - - [How to Configure LDAP with GitLab EE](https://docs.gitlab.com/ee/administration/auth/how_to_configure_ldap_gitlab_ee/index.md) + - [How to Configure LDAP with GitLab EE](https://docs.gitlab.com/ee/administration/auth/how_to_configure_ldap_gitlab_ee/index.html) - [Feature Highlight: LDAP Integration](https://about.gitlab.com/2014/07/10/feature-highlight-ldap-sync/) - [Debugging LDAP](https://about.gitlab.com/handbook/support/workflows/support-engineering/ldap/debugging_ldap.html) - **Integrations:** |