Merge branch 'master' into 'master'

Updated doc/integration/twitter.md, fixed incorrect callback URL Fixed a typo in the Integration instructions for Twitter OAuth See merge request !257

Merge branch 'master' into 'master'
d3a36372 · Drew Blessing · c7db2661 · 8b6a2829 · d3a36372
Commit d3a36372 authored Dec 08, 2014 by Drew Blessing
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

No files found.
--- a/doc/integration/twitter.md
+++ b/doc/integration/twitter.md
@@ -13,7 +13,7 @@ To enable the Twitter OmniAuth provider you must register your application with 
    something else descriptive.
    - Description: Create a description.
    - Website: The URL to your GitLab installation. 'https://gitlab.example.com'
-    - Callback URL: 'https://gitlab.example.com/users/auth/github/callback'
+    - Callback URL: 'https://gitlab.example.com/users/auth/twitter/callback'
    - Agree to the "Rules of the Road."

    ![Twitter App Details](twitter_app_details.png)