Juanjo Bazán 358028c3e6 Fixes conflicts. Merge branch 'master' into ancestry

2015-09-03 16:37:28 +02:00

..

controllers

Fixes conflicts

2015-09-03 00:12:59 +02:00

features

Fixes conflicts. Merge branch 'master' into ancestry

2015-09-03 16:37:28 +02:00

helpers

adds specs for masked emails and phones

2015-08-30 15:15:13 +02:00

lib

adds touch to debates on tag destroy

2015-08-31 20:26:30 +02:00

models

Fixes conflicts. Merge branch 'master' into ancestry

2015-09-03 16:37:28 +02:00

support

Fixes conflicts. Merge branch 'master' into ancestry

2015-09-03 16:37:28 +02:00

factories.rb

adds translation for admin settings' keys names

2015-09-01 20:00:41 +02:00

i18n_spec.rb

Adds i18n-tasks

2015-08-06 18:31:26 +02:00

rails_helper.rb

Makes capybara exact. Should fix some randomly-failing specs

2015-09-02 18:05:43 +02:00

spec_helper.rb

adds controller check for anonymous votes

2015-09-01 17:49:02 +02:00