Lazy load ActionController::Base (fnando#327)

GeorgeGorbanev · Feb 27, 2018 · a1dbede · a1dbede
1 parent da97f81
commit a1dbede
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/browser/rails.rb b/lib/browser/rails.rb
@@ -9,9 +9,13 @@ class Railtie < Rails::Railtie
     config.browser = ActiveSupport::OrderedOptions.new
 
     initializer "browser" do
-      ::ActionController::Base.send :include, Browser::ActionController
-      Browser::Middleware::Context.send :include,
-                                        Browser::Middleware::Context::Additions
+      ActiveSupport.on_load(:action_controller) do
+        ::ActionController::Base.send :include, Browser::ActionController
+        Browser::Middleware::Context.send(
+          :include,
+          Browser::Middleware::Context::Additions
+        )
+      end
     end
   end
 end