summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordosire <sytses@gmail.com>2014-04-07 14:52:35 +0200
committerdosire <sytses@gmail.com>2014-04-07 14:52:35 +0200
commit5b018cc5b11d5ac66d7a3c3c77e2157b4f68e760 (patch)
tree9bd5de458167e25952e82c578001ece8a89b3b0a
parente7f80806666aef65dae9293dbda34f994299f7b2 (diff)
downloadgitlab-ce-5b018cc5b11d5ac66d7a3c3c77e2157b4f68e760.tar.gz
Name should be oauth and not twitter.
-rw-r--r--doc/integration/README.md2
-rw-r--r--doc/integration/oauth.md (renamed from doc/integration/twitter_oauth.md)2
2 files changed, 2 insertions, 2 deletions
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/twitter_oauth.md b/doc/integration/oauth.md
index fd2b72a8778..bdbf99b4174 100644
--- a/doc/integration/twitter_oauth.md
+++ b/doc/integration/oauth.md
@@ -1,4 +1,4 @@
-You can use Twitter to log into GitLab.
+You can use other services to log into GitLab via oAuth.
Please configure this in gitlab.yml