diff --git a/doc/README.md b/doc/README.md index dfa3211d01..6c8fe3a96c 100644 --- a/doc/README.md +++ b/doc/README.md @@ -11,7 +11,7 @@ **Administrator documentation** + [Install](install/README.md) Requirements, directory structures and manual installation. -+ [Integration](integration/external-issue-tracker.md) How to integrate JIRA and Redmine. ++ [Integration](integration/README.md) How to integrate with systems such as JIRA, Redmine, LDAP and Twitter. + [Raketasks](raketasks/README.md) Explore what GitLab has in store for you to make administration easier. + [System hooks](system_hooks/system_hooks.md) Let GitLab notify you when certain management tasks need to be carried out. + [Security](security/README.md) Learn what you can do to further secure your GitLab instance. diff --git a/doc/integration/README.md b/doc/integration/README.md new file mode 100644 index 0000000000..6878f875ad --- /dev/null +++ b/doc/integration/README.md @@ -0,0 +1,3 @@ ++ [External issue tracker](external-issue-tracker.md) ++ [LDAP](ldap.md) ++ [Twitter](twitter.md) diff --git a/doc/integration/twitter_app_api_keys.png b/doc/integration/twitter_app_api_keys.png new file mode 100644 index 0000000000..1076337172 Binary files /dev/null and b/doc/integration/twitter_app_api_keys.png differ diff --git a/doc/integration/twitter_app_details.png b/doc/integration/twitter_app_details.png new file mode 100644 index 0000000000..a4cb269df5 Binary files /dev/null and b/doc/integration/twitter_app_details.png differ diff --git a/doc/integration/twitter_oauth.md b/doc/integration/twitter_oauth.md new file mode 100644 index 0000000000..b4317beb19 --- /dev/null +++ b/doc/integration/twitter_oauth.md @@ -0,0 +1,9 @@ +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) +