Fix merge conflicts
This commit is contained in:
@@ -4,6 +4,11 @@ class Poll < ApplicationRecord
|
|||||||
include ActsAsParanoidAliases
|
include ActsAsParanoidAliases
|
||||||
include Notifiable
|
include Notifiable
|
||||||
|
|
||||||
|
translates :name, touch: true
|
||||||
|
translates :summary, touch: true
|
||||||
|
translates :description, touch: true
|
||||||
|
include Globalizable
|
||||||
|
|
||||||
RECOUNT_DURATION = 1.week
|
RECOUNT_DURATION = 1.week
|
||||||
|
|
||||||
has_many :booth_assignments, class_name: "Poll::BoothAssignment"
|
has_many :booth_assignments, class_name: "Poll::BoothAssignment"
|
||||||
|
|||||||
Reference in New Issue
Block a user