aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-08-19 00:52:54 -0300
committerGitHub <noreply@github.com>2016-08-19 00:52:54 -0300
commit0db945ac9564d8e7e559397cdeeef148d2aec704 (patch)
treee4226b30aae71e6f160ace3ca1380014fbd3207c /railties/lib/rails
parenteabf024369110f4ef2349a8181379026ed9f4819 (diff)
parent72831d75b6aa25ff89144eeb7e9698c4f93e65ea (diff)
downloadrails-0db945ac9564d8e7e559397cdeeef148d2aec704.tar.gz
rails-0db945ac9564d8e7e559397cdeeef148d2aec704.tar.bz2
rails-0db945ac9564d8e7e559397cdeeef148d2aec704.zip
Merge pull request #26216 from y-yagi/fixes_19880
run `before_configuration` callbacks as soon as application constant inherits from Rails::Application
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/application.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 9c150965bf..b01196e3ed 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -87,6 +87,7 @@ module Rails
super
Rails.app_class = base
add_lib_to_load_path!(find_root(base.called_from))
+ ActiveSupport.run_load_hooks(:before_configuration, base)
end
def instance
@@ -146,7 +147,6 @@ module Rails
def run_load_hooks! # :nodoc:
return self if @ran_load_hooks
@ran_load_hooks = true
- ActiveSupport.run_load_hooks(:before_configuration, self)
@initial_variable_values.each do |variable_name, value|
if INITIAL_VARIABLES.include?(variable_name)