Merge branch 'add-twitter' into 'master'

Add twitter documentation

Merge branch 'add-twitter' into 'master'
Add twitter documentation
Dmitriy Zaporozhets
2 parents ab7b8b21 ba72bd1d
Showing 5 changed files with 13 additions and 1 deletions Show diff stats
doc/README.md
doc/integration/README.md
doc/integration/twitter_app_api_keys.png
doc/integration/twitter_app_details.png
doc/integration/twitter_oauth.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.
@@ -0,0 +1,3 @@
++ [External issue tracker](external-issue-tracker.md)
++ [LDAP](ldap.md)
++ [Twitter](twitter.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)
+
	@@ -11,7 +11,7 @@		@@ -11,7 +11,7 @@
11	Administrator documentation	11	Administrator documentation
12		12
13	+ [Install](install/README.md) Requirements, directory structures and manual installation.	13	+ [Install](install/README.md) Requirements, directory structures and manual installation.
14	-+ [Integration](integration/external-issue-tracker.md) How to integrate JIRA and Redmine.	14	++ [Integration](integration/README.md) How to integrate with systems such as JIRA, Redmine, LDAP and Twitter.
15	+ [Raketasks](raketasks/README.md) Explore what GitLab has in store for you to make administration easier.	15	+ [Raketasks](raketasks/README.md) Explore what GitLab has in store for you to make administration easier.
16	+ [System hooks](system_hooks/system_hooks.md) Let GitLab notify you when certain management tasks need to be carried out.	16	+ [System hooks](system_hooks/system_hooks.md) Let GitLab notify you when certain management tasks need to be carried out.
17	+ [Security](security/README.md) Learn what you can do to further secure your GitLab instance.	17	+ [Security](security/README.md) Learn what you can do to further secure your GitLab instance.
@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
	1	++ [External issue tracker](external-issue-tracker.md)
	2	++ [LDAP](ldap.md)
	3	++ [Twitter](twitter.md)
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+You can use Twitter to log into GitLab.
	2	+
	3	+Please configure this in gitlab.yml
	4	+
	5	+Below are screenshots how to setup your app on Twitter for this.
	6	+
	7	+![Application details](twitter_app_details.png)
	8	+![API Keys](twitter_app_api_keys.png)
	9	+