Merge branch 'master' into 1856-legislation_processes_proposals_phase

This commit is contained in:
decabeza
2017-10-25 11:52:31 +02:00
186 changed files with 3595 additions and 1550 deletions

View File

@@ -3,7 +3,7 @@ class Comment < ActiveRecord::Base
include HasPublicAuthor
include Graphqlable
COMMENTABLE_TYPES = %w(Debate Proposal Budget::Investment Poll::Question Legislation::Question Legislation::Annotation Topic Legislation::Proposal).freeze
COMMENTABLE_TYPES = %w(Debate Proposal Budget::Investment Poll::Question Legislation::Question Legislation::Annotation Topic Legislation::Proposal Poll).freeze
acts_as_paranoid column: :hidden_at
include ActsAsParanoidAliases