Merge branch 'link-to-github-app' into 'master'

Link to github app

Merge branch 'link-to-github-app' into 'master'
Link to github app
5d6e9ea8 · Dmitriy Zaporozhets · e7f80806 · 5b018cc5 · 5d6e9ea8 · 5d6e9ea8
Commit 5d6e9ea8 authored Apr 07, 2014 by Dmitriy Zaporozhets
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

doc/integration/README.md doc/integration/README.md +1 -1

doc/integration/oauth.md doc/integration/oauth.md +1 -1

No files found.
--- a/doc/integration/README.md
+++ b/doc/integration/README.md
 + [External issue tracker](external-issue-tracker.md)
 + [LDAP](ldap.md)
-+ [Twitter](twitter.md)
+ [oAuth](twitter.md) Login with Twitter, GitHub, etc.
--- a/doc/integration/twitter_oauth.md
+++ b/doc/integration/twitter_oauth.md
-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