diff options
| author | Drew Blessing <drew.blessing@mac.com> | 2014-12-08 23:14:10 +0000 |
|---|---|---|
| committer | Drew Blessing <drew.blessing@mac.com> | 2014-12-08 23:14:10 +0000 |
| commit | d3a363729ff6ba0003f4674beae1ecd44958a402 (patch) | |
| tree | 677e980e8c11be04f8c0c9e1014d0778635ead5a | |
| parent | c7db2661a5d7c6bf14479c18e808d1d8c619a95c (diff) | |
| parent | 8b6a2829ce400dda594500d2a8822dfdb11d8781 (diff) | |
| download | gitlab-ce-d3a363729ff6ba0003f4674beae1ecd44958a402.tar.gz | |
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
| -rw-r--r-- | doc/integration/twitter.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/integration/twitter.md b/doc/integration/twitter.md index d1b52927d30..b9e501c5ec1 100644 --- 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."  |