Commit 99450432 authored by Mike Jang's avatar Mike Jang

Merge branch 'patch-110' into 'master'

Cleanup OAuth2 links between related pages

See merge request gitlab-org/gitlab!30924
parents 8a7806ff 187ad022
...@@ -4,7 +4,7 @@ This document covers using the [OAuth2](https://oauth.net/2/) protocol to allow ...@@ -4,7 +4,7 @@ This document covers using the [OAuth2](https://oauth.net/2/) protocol to allow
other services to access GitLab resources on user's behalf. other services to access GitLab resources on user's behalf.
If you want GitLab to be an OAuth authentication service provider to sign into If you want GitLab to be an OAuth authentication service provider to sign into
other services, see the [OAuth2 provider](../integration/oauth_provider.md) other services, see the [OAuth2 authentication service provider](../integration/oauth_provider.md)
documentation. This functionality is based on the documentation. This functionality is based on the
[doorkeeper Ruby gem](https://github.com/doorkeeper-gem/doorkeeper). [doorkeeper Ruby gem](https://github.com/doorkeeper-gem/doorkeeper).
......
...@@ -5,6 +5,8 @@ to sign in to other services. ...@@ -5,6 +5,8 @@ to sign in to other services.
If you want to use: If you want to use:
- The [OAuth2](https://oauth.net/2/) protocol to access GitLab resources on user's behalf,
see [OAuth2 provider](../api/oauth2.md)
- Other OAuth authentication service providers to sign in to - Other OAuth authentication service providers to sign in to
GitLab, see the [OAuth2 client documentation](omniauth.md). GitLab, see the [OAuth2 client documentation](omniauth.md).
- The related API, see [Applications API](../api/applications.md). - The related API, see [Applications API](../api/applications.md).
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment