summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authordosire <sytses@gmail.com>2014-04-07 11:53:48 +0200
committerdosire <sytses@gmail.com>2014-04-07 11:53:48 +0200
commitba72bd1deeaeedc6f37c1374db933d837d7c5fef (patch)
tree3c1856c5c4eb2d7a4d5b9ca7455d5069f7809ea9 /doc
parent7611ce72b97da690317a1adb2a0bdf17bddb1b8c (diff)
downloadgitlab-ce-ba72bd1deeaeedc6f37c1374db933d837d7c5fef.tar.gz
Add twitter documentation.
Diffstat (limited to 'doc')
-rw-r--r--doc/README.md2
-rw-r--r--doc/integration/README.md3
-rw-r--r--doc/integration/twitter_app_api_keys.pngbin0 -> 72200 bytes
-rw-r--r--doc/integration/twitter_app_details.pngbin0 -> 106979 bytes
-rw-r--r--doc/integration/twitter_oauth.md9
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
new file mode 100644
index 00000000000..1076337172a
--- /dev/null
+++ b/doc/integration/twitter_app_api_keys.png
Binary files differ
diff --git a/doc/integration/twitter_app_details.png b/doc/integration/twitter_app_details.png
new file mode 100644
index 00000000000..a4cb269df52
--- /dev/null
+++ b/doc/integration/twitter_app_details.png
Binary files differ
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.
+
+![Application details](twitter_app_details.png)
+![API Keys](twitter_app_api_keys.png)
+