Merge branch 'master' into legislation-module-stable

This commit is contained in:
Amaia Castro
2017-01-11 22:54:41 +01:00
235 changed files with 9717 additions and 656 deletions

View File

@@ -10,7 +10,7 @@ class Comment < ActiveRecord::Base
validates :body, presence: true
validates :user, presence: true
validates_inclusion_of :commentable_type, in: ["Debate", "Proposal", "Legislation::Question", "Legislation::Annotation"]
validates_inclusion_of :commentable_type, in: ["Debate", "Proposal", "Budget::Investment", "Legislation::Question", "Legislation::Annotation"]
validate :validate_body_length