Merge branch 'master' into aperez-admin-question-videos

2017-10-06 01:12:22 +02:00
parent 5862eea516 806fd85246
commit c72f95c72b
42 changed files with 460 additions and 277 deletions
--- a/app/models/poll/question/answer.rb
+++ b/app/models/poll/question/answer.rb
@@ -1,4 +1,6 @@
 class Poll::Question::Answer < ActiveRecord::Base
+	include Galleryable
+
  belongs_to :question, class_name: 'Poll::Question', foreign_key: 'question_id'
  has_many :videos, class_name: 'Poll::Question::Answer::Video'