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
This commit is contained in:
Drew Blessing 2014-12-08 23:14:10 +00:00
commit d3a363729f

View file

@ -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)