Example callback URL was incorrect
(referencing /users/auth/github/callback,
 not /users/auth/twitter/callback)
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
Add security tips about file and paths
Merge branch 'doc/file_read' into 'master'

Add security tips about file and paths

These are some extra guidelines to guard against code execution and path traversal.

See merge request !1317
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce