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
This commit is contained in:
MaiteHdezRivas
2016-01-27 13:11:23 +01:00
16 changed files with 198 additions and 18 deletions

View File

@@ -23,6 +23,9 @@ module Abilities
can :create, Debate
can :create, Proposal
can :suggest, Debate
can :suggest, Proposal
can [:flag, :unflag], Comment
cannot [:flag, :unflag], Comment, user_id: user.id