diff --git a/doc/integration/README.md b/doc/integration/README.md index 6878f87..9e6a77e 100644 --- a/doc/integration/README.md +++ b/doc/integration/README.md @@ -1,3 +1,3 @@ + [External issue tracker](external-issue-tracker.md) + [LDAP](ldap.md) -+ [Twitter](twitter.md) ++ [oAuth](twitter.md) Login with Twitter, GitHub, etc. diff --git a/doc/integration/oauth.md b/doc/integration/oauth.md new file mode 100644 index 0000000..bdbf99b --- /dev/null +++ b/doc/integration/oauth.md @@ -0,0 +1,12 @@ +You can use other services to log into GitLab via oAuth. + +Please configure this in gitlab.yml + +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 app](github_app.png) diff --git a/doc/integration/twitter_oauth.md b/doc/integration/twitter_oauth.md deleted file mode 100644 index fd2b72a..0000000 --- a/doc/integration/twitter_oauth.md +++ /dev/null @@ -1,12 +0,0 @@ -You can use Twitter to log into GitLab. - -Please configure this in gitlab.yml - -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 app](github_app.png) -- libgit2 0.21.2