MaiteHdezRivas 5dd4633d6a Merge branch 'suggest_before_creating' ...

Conflicts:
	app/assets/javascripts/application.js
	app/controllers/debates_controller.rb
	app/controllers/proposals_controller.rb
	config/locales/es.yml
	config/routes.rb
	db/schema.rb
	spec/features/debates_spec.rb
	spec/features/proposals_spec.rb

2016-01-27 13:11:23 +01:00

..

.keep

initial commit

2015-07-15 13:32:13 +02:00

commentable_actions.rb

Merge branch 'suggest_before_creating'

2016-01-27 13:11:23 +01:00

feature_flags.rb

Feature-flag debates

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

flag_actions.rb

users resource_model instead of controller_name

2015-09-29 12:03:19 +02:00

has_filters.rb

Refactors has_filters.rb

2015-09-04 11:50:29 +02:00

has_orders.rb

Extract HasOrders + partial from DebatesController

2015-09-12 16:48:41 +02:00

moderate_actions.rb

refactors moderator actions

2015-10-11 13:57:19 +02:00

polymorphic.rb

refactors concern's polymorphic helpers

2015-10-11 13:40:31 +02:00