summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-07-27 17:41:40 +0000
committerRobert Speicher <robert@gitlab.com>2017-07-27 17:41:40 +0000
commit86ae883b638d29953f26a87efc16ae613ff865e4 (patch)
tree6d216f1ec842e8cb72a9efac4ba576146aa176a5 /doc
parent066f4d8b715aa6c58bffe39b7f9fb35e6e6ff8a9 (diff)
parentf837cd6611a39d3dd38655821f32feb2c2abba8d (diff)
downloadgitlab-ce-86ae883b638d29953f26a87efc16ae613ff865e4.tar.gz
Merge branch 'backport-ee-2456' into 'master'
Skip OAuth authorization for trusted applications See merge request !13061
Diffstat (limited to 'doc')
-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