rgarcia 0505be08e8 fixes conflicts

2016-01-25 22:24:58 +01:00

..

activity_spec.rb

Updates tests with new texts

2015-10-28 12:47:51 +01:00

comments_spec.rb

Updates tests with new texts

2015-10-28 12:47:51 +01:00

debates_spec.rb

Feature-flag debates

2016-01-18 13:05:00 +01:00

feature_flags_spec.rb

adds specific treatment for feature flags in admin

2016-01-25 14:52:57 +01:00

moderators_spec.rb

fixes travis

2015-09-28 17:19:53 +02:00

officials_spec.rb

Updates tests with new texts

2015-10-28 12:47:51 +01:00

organizations_spec.rb

Updates tests with new texts

2015-10-28 12:47:51 +01:00

proposals_spec.rb

ignores in moderation the admin restored proposals

2015-09-25 13:24:12 +02:00

settings_spec.rb

Updates tests with new texts

2015-10-28 12:47:51 +01:00

spending_proposals_spec.rb

Feature flag spending proposals

2016-01-18 13:05:00 +01:00

tags_spec.rb

Add Thematic structure and Districts - Iss685 - 12 january 2016

2016-01-13 12:11:33 +01:00

users_spec.rb

adds pending filter to admin/users

2015-09-06 21:58:34 +02:00

verifications_spec.rb

Updates tests with new texts

2015-10-28 12:47:51 +01:00