From b4149864f4c6561a191b6b447c6d9da27eb94f8a Mon Sep 17 00:00:00 2001 From: Jared Beck Date: Tue, 13 Dec 2016 22:27:29 -0500 Subject: [PATCH] Remove rails 3 branch of association definition --- lib/paper_trail/model_config.rb | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/lib/paper_trail/model_config.rb b/lib/paper_trail/model_config.rb index ab44fc26..61edc973 100644 --- a/lib/paper_trail/model_config.rb +++ b/lib/paper_trail/model_config.rb @@ -124,22 +124,12 @@ module PaperTrail @model_class.send :attr_accessor, :paper_trail_event - # In rails 4, the `has_many` syntax for specifying order uses a lambda. - if ::ActiveRecord::VERSION::MAJOR >= 4 - @model_class.has_many( - @model_class.versions_association_name, - -> { order(model.timestamp_sort_order) }, - class_name: @model_class.version_class_name, - as: :item - ) - else - @model_class.has_many( - @model_class.versions_association_name, - class_name: @model_class.version_class_name, - as: :item, - order: @model_class.paper_trail.version_class.timestamp_sort_order - ) - end + @model_class.has_many( + @model_class.versions_association_name, + -> { order(model.timestamp_sort_order) }, + class_name: @model_class.version_class_name, + as: :item + ) end # Adds callbacks to record changes to habtm associations such that on save