diff options
| author | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2016-07-26 08:12:55 +0900 |
|---|---|---|
| committer | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2016-08-19 12:12:00 +0900 |
| commit | 72831d75b6aa25ff89144eeb7e9698c4f93e65ea (patch) | |
| tree | 62eea6a6be808e59dfcd2cfad0e0b14e6cd93c61 /railties/lib/rails/application.rb | |
| parent | 6568cfd78c89fe70ac7304d03f8f4825fe0b7c72 (diff) | |
| download | rails-72831d75b6aa25ff89144eeb7e9698c4f93e65ea.tar.gz rails-72831d75b6aa25ff89144eeb7e9698c4f93e65ea.tar.bz2 rails-72831d75b6aa25ff89144eeb7e9698c4f93e65ea.zip | |
run `before_configuration` callbacks as soon as application constant inherits from Rails::Application
Until Rails 4.1, `before_configuration` run as soon as the application constant
inherits from `Rails::Application`.
However, in d25fe31c40928712b5e08fe0afb567c3bc88eddf, it has been modified to
run at instantiation process.
This modify to `before_configuration` is run at same timing as to Rails 4.1.
Fixes #19880
Diffstat (limited to 'railties/lib/rails/application.rb')
| -rw-r--r-- | railties/lib/rails/application.rb | 2 |
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) |