Merge branch 'master' into abstract_optional

This commit is contained in:
James Mason 2017-12-11 17:38:34 -08:00 committed by GitHub
commit 3472c2210a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
92 changed files with 409 additions and 213 deletions

View file

@ -1,4 +1,4 @@
class Event < ActiveRecord::Base
class Event < ApplicationRecord
include ActiveRecord::Transitions
include RevisionCount
has_paper_trail on: [:create, :update], ignore: [:updated_at, :guid, :week], meta: { conference_id: :conference_id }