Many code blocks are 4spaced, and they render in GitLab
without coloring as a result, even though they are
fenced with a language label. If in a list, other items
will render as being in a code block too, even if not
meant to. This fixes all these issues, and cleans up
minor white space issues in install and integration docs
To prevent an OAuth2 covert redirect vulnerability, this commit adds and
uses an alias for the GitHub and BitBucket OAuth2 callback URLs to the
following paths:
GitHub: /users/auth/-/import/github
Bitbucket: /users/auth/-/import/bitbucket
This allows admins to put a more restrictive callback URL in the OAuth2
configuration settings. Instead of https://example.com, admins can now use:
https://example.com/users/auth
It's possible but not trivial to change Devise and OmniAuth to use a
different prefix for callback URLs instead of /users/auth. For now,
aliasing the import URLs under the /users/auth namespace should suffice.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56663
Fix escaped angle bracket's in integration documentation.
There are several escaped angle brackets in our integration docs. While these
render fine within GitLab, they are broken when rendered on doc.gitlab.com because
pandoc does not escape them correctly.
You can see the problem here: http://doc.gitlab.com/ce/integration/github.html
Note that the strings `<Organization>` and `<Your Name>` are being interpreted as html tags.
It looks like doc.gitlab.com is using pandoc: https://gitlab.com/gitlab-com/doc-gitlab-com/blob/master/generate.rb#L64
You can verify these changes by running something like this and then inspecting `test.html`:
pandoc --from markdown_github-hard_line_breaks -o test.html doc/integration/twitter.md
You can also verify that GitLab continues to render the docs correctly by checking, for example, http://localhost:3000/help/integration/twitter.md
See merge request !4128
There are several escaped angle brackets in our integration docs. While these
render fine within GitLab, they are broken rendered on doc.gitlab.com because
pandoc does not escape them correctly.
There are two callbacks that could be used with Github integration:
* /import/github/callback (used by project import)
* /users/auth/github/callback (used by OmniAuth)
Github's documentation suggests that authorization callback url should be
set to the longest common path.
https://developer.github.com/v3/oauth/#redirect-urls
Configuring according to the previous documentation resulted in a
redirect_uri_mismatch error from Github when logging in via OmniAuth.
These changes were pulled from GitLab EE to support configuring
an alternative API URL than the default https://api.github.com.
In addition, the `verify_ssl` flag allows users to disable SSL cert
checking.
One modification: add a default `args` option if it does not exist
to avoid breaking existing configurations.
GitLab Bot
Marcel Amirault
Wei-Meng Lee
Mike Lewis
Evan Read
Dennis Jekubczyk
Stan Hu
Takuya Noguchi
Marcel Amirault
Achilleas Pipinellis
Xiaogang Wen
Cindy Pallares
Achilleas Pipinellis
Florian
Eric K Idema
Alex Jordan
Achilleas Pipinellis
Chia Yu Pai
Tobias Stöckler
Kuo-Cheng Yeu