Defer modification of ActionController::Base to when it is loaded (#250)

rubyconfig · Jan 6, 2020 · 0ce94f0 · 0ce94f0
1 parent 565b665
commit 0ce94f0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,10 +2,11 @@
 
 ## Unreleased
 
-### New features
+### Performance improvements
 
 * Get rid of unused Rails Engine class definition ([#247](https://github.com/railsconfig/config/pull/247))
 * Require dry-validation only when schema is specified ([#253](https://github.com/railsconfig/config/pull/253))
+* Defer modification of `ActionController::Base` to when it is loaded in Rails integration ([#250](https://github.com/railsconfig/config/pull/250))
 
 ### Bug fixes
 

diff --git a/lib/config/integrations/rails/railtie.rb b/lib/config/integrations/rails/railtie.rb
@@ -23,7 +23,7 @@ def preload
         # Development environment should reload settings on every request
         if ::Rails.env.development?
           initializer :config_reload_on_development do
-            ActionController::Base.class_eval do
+            ActiveSupport.on_load :action_controller_base do
               if ::Rails::VERSION::MAJOR >= 4
                 prepend_before_action { ::Config.reload! }
               else