diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-07 10:40:15 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-07 10:40:15 +0000 |
| commit | d8ed899038458f6de3709d8a2c90ec1f897df782 (patch) | |
| tree | 92b73678f5c2c668d209884643b98a8de0ecb414 /doc | |
| parent | ab7b8b2125889f0f3ba03e65d1ce26088e30631e (diff) | |
| parent | ba72bd1deeaeedc6f37c1374db933d837d7c5fef (diff) | |
| download | gitlab-ce-d8ed899038458f6de3709d8a2c90ec1f897df782.tar.gz | |
Merge branch 'add-twitter' into 'master'
Add twitter documentation
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/README.md | 2 | ||||
| -rw-r--r-- | doc/integration/README.md | 3 | ||||
| -rw-r--r-- | doc/integration/twitter_app_api_keys.png | bin | 0 -> 72200 bytes | |||
| -rw-r--r-- | doc/integration/twitter_app_details.png | bin | 0 -> 106979 bytes | |||
| -rw-r--r-- | doc/integration/twitter_oauth.md | 9 |
5 files changed, 13 insertions, 1 deletions
diff --git a/doc/README.md b/doc/README.md index dfa3211d01b..6c8fe3a96ce 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 00000000000..6878f875ad7 --- /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 Binary files differnew file mode 100644 index 00000000000..1076337172a --- /dev/null +++ b/doc/integration/twitter_app_api_keys.png diff --git a/doc/integration/twitter_app_details.png b/doc/integration/twitter_app_details.png Binary files differnew file mode 100644 index 00000000000..a4cb269df52 --- /dev/null +++ b/doc/integration/twitter_app_details.png diff --git a/doc/integration/twitter_oauth.md b/doc/integration/twitter_oauth.md new file mode 100644 index 00000000000..b4317beb190 --- /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. + + + + |
