Merge branch 'master' into polls

2017-01-19 16:51:19 +01:00
parent 0e9cec2ca6 c918c9e081
commit 113f9b32d7
254 changed files with 10658 additions and 871 deletions
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -10,7 +10,8 @@ class Comment < ActiveRecord::Base

  validates :body, presence: true
  validates :user, presence: true
-  validates_inclusion_of :commentable_type, in: ["Debate", "Proposal", "Poll::Question"]
+
+  validates_inclusion_of :commentable_type, in: ["Debate", "Proposal", "Budget::Investment", "Poll::Question"]

  validate :validate_body_length