Merge pull request #48 from LaunchPadLab/active-record-autoloading-issue

fix dependency issue with how TokenMaster::Model module is added to A…
LaunchPadLab · Oct 30, 2017 · ff8c32a · ff8c32a
2 parents 8e2efbf + b3d44fc
commit ff8c32a
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/lib/token_master/railtie.rb b/lib/token_master/railtie.rb
@@ -6,11 +6,7 @@ class Railtie < ::Rails::Railtie
 
     initializer 'token_master.active_record' do
       ActiveSupport.on_load :active_record do
-        if Rails::VERSION::MAJOR >= 5
-          ::ApplicationRecord.include(TokenMaster::Model)
-        else
-          ::ActiveRecord::Base.include(TokenMaster::Model)
-        end
+        include TokenMaster::Model
       end
     end
   end