Robert Speicher 0175769aa8 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

2015-09-23 17:20:37 +00:00

..

assets

Fix top margin for sign-in button on public pages

2015-09-23 12:58:00 -04:00

controllers

Merge branch 'rs-fix-help-links' into 'master'

2015-09-23 11:44:17 +00:00

finders

Fix 500 on trending projects if isntance has 100k+ projects

2015-09-18 10:45:42 +02:00

helpers

Merge branch 'fix-markdown-truncation-removing-links' into 'master'

2015-09-23 17:20:37 +00:00

mailers

Merge branch 'master' into rename-reply-by-email

2015-09-21 10:35:56 +02:00

models

Refactor Project#enable_ci method

2015-09-23 16:52:26 +02:00

services

Rescue rugged error when detect ci yml file

2015-09-23 14:29:41 +02:00

uploaders

Fix URL to uploaded file.

2015-02-20 16:01:37 +01:00

views

Merge branch 'make-commit-graphs-responsive' into 'master'

2015-09-23 16:31:32 +00:00

workers

Rename reply_by_email to incoming_email to prepare for the future.

2015-09-21 10:35:37 +02:00