kikito fc4e67824b Merge branch 'master' into debates_description_html ...

I removed the truncation from debates.description because
debates.description returns html

Conflicts:
	app/views/debates/_debate.html.erb
	app/views/debates/show.html.erb

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

..

features

Merge branch 'master' into debates_description_html

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

helpers

fixes specs [#45]

2015-07-28 18:32:51 +02:00

lib

Adds TagSanitizer

2015-08-03 19:30:06 +02:00

models

Make debate.description always html_safe

2015-08-04 18:42:49 +02:00

factories.rb

fixes build

2015-08-04 17:56:38 +02:00

rails_helper.rb

makes test suite default to :en locale

2015-07-28 12:52:10 +02:00

spec_helper.rb

fixes conflicts [#21]

2015-07-27 21:55:43 +02:00