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

..

controllers

Merge branch 'fix-issue-2593' into 'master'

2015-09-21 20:46:15 +00:00

factories

Refactor ci_admin_event and fix features/ci/events_spec.rb

2015-09-15 20:56:20 +02:00

features

Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g

2015-09-15 22:40:35 +02:00

finders

Add Group#add_* convenience methods

2015-08-07 00:20:02 -04:00

fixtures

No HTML-only email please

2015-08-21 16:09:55 -07:00

helpers

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

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

javascripts

Add specs for syntax_highlight JS

2015-09-10 15:38:24 -04:00

lib

Merge branch 'rs-relative-link-up-one' into 'master'

2015-09-21 19:38:37 +00:00

mailers

Devise 3.5.x deprecates confirm! in favor of confirm

2015-09-19 21:15:13 -04:00

models

Enable CI for gitlab when .gitlab-ci.yml is pushed

2015-09-23 13:11:40 +02:00

requests

Merge branch 'fix-user-identities-api' into 'master'

2015-09-23 09:13:23 +00:00

routing

Move partial to right place and fix tests.

2015-09-08 15:14:14 +01:00

services

Ensure raise_error expectations provide arguments

2015-09-21 15:35:29 -04:00

support

Rename reply_by_email to incoming_email to prepare for the future.

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

tasks/gitlab

Fix backup tests

2015-09-16 00:06:41 +02:00

workers

Rename reply_by_email to incoming_email to prepare for the future.

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

factories_spec.rb

Remove the invalid key factories

2015-04-11 17:12:10 -04:00

factories.rb

Only publish ssh key-type and key

2015-08-04 14:33:18 +02:00

rails_helper.rb

Started on the actual rspec 3 upgrade

2015-06-22 12:12:49 +02:00

spec_helper.rb

Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g

2015-09-11 16:32:11 +02:00

teaspoon_env.rb

teaspoon install

2015-05-28 18:22:32 -04:00