diff --git a/doc/integration/google_app.png b/doc/integration/google_app.png new file mode 100644 index 00000000000..5a62ad35009 Binary files /dev/null and b/doc/integration/google_app.png differ diff --git a/doc/integration/oauth.md b/doc/integration/oauth.md index bdbf99b4174..904c9157a04 100644 --- a/doc/integration/oauth.md +++ b/doc/integration/oauth.md @@ -1,12 +1,55 @@ +# OAuth + You can use other services to log into GitLab via oAuth. -Please configure this in gitlab.yml +For this you need: + +* create app in selected services +* configure gitlab.yml + +## Twitter: Below are screenshots how to setup your app on Twitter for this: ![Application details](twitter_app_details.png) ![API Keys](twitter_app_api_keys.png) -And GitHub: +## GitHub: ![GitHub app](github_app.png) + +## Google: + +![Google app](google_app.png) + + +## GitLab config file + +Second step is to modify gitlab.yml with app credentials: + +``` +production: + ... + + omniauth: + enabled: true + + providers: + - { + name: 'twitter', + app_id: 'XXXXXXXX', + app_secret: 'XXXXXXXXXXXXXXXXXXXXXXXX' + } + - { + name: 'google_oauth2', + app_id: 'XXXXXXXXXXX.apps.googleusercontent.com', + app_secret: 'XXXXXXXX' + } + - { + name: 'github', + app_id: 'XXXXXXXXXX', + app_secret: 'XXXXXXXXXXXXXXXXXXXXXXXX' + } + +``` + diff --git a/doc/integration/twitter_app_details.png b/doc/integration/twitter_app_details.png index a4cb269df52..b95e8af8a74 100644 Binary files a/doc/integration/twitter_app_details.png and b/doc/integration/twitter_app_details.png differ