summaryrefslogtreecommitdiff
path: root/doc/integration/oauth_provider.md
diff options
context:
space:
mode:
authorOswaldo Ferreira <oswaldo@gitlab.com>2017-07-24 17:45:12 -0300
committerRobert Speicher <rspeicher@gmail.com>2017-07-27 12:09:46 -0400
commite561b142fa7c9dd636fd056fc0a6c84961d0cd46 (patch)
tree10e34698af1d5a3647840faee470e6047b782e30 /doc/integration/oauth_provider.md
parent9981814514742a2ee507d4dcc2fd71099fd96585 (diff)
downloadgitlab-ce-e561b142fa7c9dd636fd056fc0a6c84961d0cd46.tar.gz
Backport gitlab-ee!2456
Diffstat (limited to 'doc/integration/oauth_provider.md')
-rw-r--r--doc/integration/oauth_provider.md3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/integration/oauth_provider.md b/doc/integration/oauth_provider.md
index af8a1c4e5ed..8ba2e8731c8 100644
--- a/doc/integration/oauth_provider.md
+++ b/doc/integration/oauth_provider.md
@@ -63,6 +63,9 @@ it from the admin area.
![OAuth admin_applications](img/oauth_provider_admin_application.png)
+You're also able to mark an application as _trusted_ when creating it through the admin area. By doing that,
+the user authorization step is automatically skipped for this application.
+
---
## Authorized applications