diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-09-23 17:20:37 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-09-23 17:20:37 +0000 |
| commit | 0175769aa88704dac400fb811d8d6433d29b2d16 (patch) | |
| tree | ce84632e88b0e064688ca5d35b40a3988942c270 /doc/gitlab-basics | |
| parent | 3f2c0e94dfbba060ea2c35fc73a2d07bf4988ae3 (diff) | |
| parent | a7b0ee3fd17d4e2afd427606b002d3a9f7c6673d (diff) | |
| download | gitlab-ce-0175769aa88704dac400fb811d8d6433d29b2d16.tar.gz | |
Merge branch 'fix-markdown-truncation-removing-links' into 'master'
Fix cases where Markdown did not render links in activity feed
HTML would be stripped in `truncate_if_block` when a comment had multiple lines
and the first wasn't long enough to be truncated. The use of `node.content` would
strip all HTML tags. Using `node.inner_html` retains these tags and puts the
"..." in between paragraph tags.
Closes #2586
See merge request !1401
Diffstat (limited to 'doc/gitlab-basics')
0 files changed, 0 insertions, 0 deletions