Fix merge conflicts

2019-04-29 14:22:22 +02:00
parent 51ced318e0
commit 99023a01c9
1 changed files with 5 additions and 0 deletions
--- a/app/models/poll.rb
+++ b/app/models/poll.rb
@@ -4,6 +4,11 @@ class Poll < ApplicationRecord
  include ActsAsParanoidAliases
  include Notifiable

+  translates :name,        touch: true
+  translates :summary,     touch: true
+  translates :description, touch: true
+  include Globalizable
+
  RECOUNT_DURATION = 1.week

  has_many :booth_assignments, class_name: "Poll::BoothAssignment"