From 5b018cc5b11d5ac66d7a3c3c77e2157b4f68e760 Mon Sep 17 00:00:00 2001 From: dosire Date: Mon, 7 Apr 2014 14:52:35 +0200 Subject: Name should be oauth and not twitter. --- doc/integration/README.md | 2 +- doc/integration/oauth.md | 12 ++++++++++++ doc/integration/twitter_oauth.md | 12 ------------ 3 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 doc/integration/oauth.md delete mode 100644 doc/integration/twitter_oauth.md diff --git a/doc/integration/README.md b/doc/integration/README.md index 6878f875ad7..9e6a77edeb6 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 00000000000..bdbf99b4174 --- /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 fd2b72a8778..00000000000 --- 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) -- cgit v1.2.3