Merge pull request #1136 from paper-trail-gem/oops_forgot_to_move_the…

…_require Do not require PT-AT
paper-trail-gem · Aug 15, 2018 · 2e697fd · 2e697fd
2 parents 6c34a3d + ed4a391
commit 2e697fd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lib/paper_trail.rb b/lib/paper_trail.rb
@@ -141,7 +141,3 @@ def version
 else
   require "paper_trail/frameworks/active_record"
 end
-
-# https://github.com/paper-trail-gem/paper_trail/issues/1070
-# https://github.com/westonganger/paper_trail-association_tracking/issues/2
-require "paper_trail-association_tracking"
diff --git a/spec/dummy_app/config/application.rb b/spec/dummy_app/config/application.rb
@@ -9,6 +9,12 @@
 Bundler.require(:default, Rails.env)
 require "paper_trail"
 
+# As of PT 10, PT-AT is a development dependency in paper_trail.gemspec
+# https://github.com/paper-trail-gem/paper_trail/issues/1070
+# https://github.com/westonganger/paper_trail-association_tracking/issues/2
+# https://github.com/westonganger/paper_trail-association_tracking/issues/7
+require "paper_trail-association_tracking"
+
 module Dummy
   class Application < Rails::Application
     config.encoding = "utf-8"