diff options
author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-08-10 14:14:36 +0000 |
---|---|---|
committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-08-10 14:14:36 +0000 |
commit | b50e8c293452f65990f1a97050b474c95755b660 (patch) | |
tree | c0a7cb34368727f6254189c934b8dd5c30216e3e /CHANGELOG | |
parent | eccefa9bfad94426f9bd87f7b5fd18289bd443f1 (diff) | |
parent | ae2d4d2de03f2ff25a79266128ef75d5e301e298 (diff) | |
download | gitlab-ce-b50e8c293452f65990f1a97050b474c95755b660.tar.gz |
Merge branch 'fix-angle-brackets-in-docs' into 'master'
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
Diffstat (limited to 'CHANGELOG')
0 files changed, 0 insertions, 0 deletions