diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-07 17:33:40 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-07 17:35:00 -0300 |
| commit | e1404ec824d263d25717468c6f4b73ee7b2bdf4c (patch) | |
| tree | 1c1e5993772def502a66300001eeeb54f95e5dba /railties/lib/rails | |
| parent | 70c83f49f8fcefdf52c2ed22706a14e29559cea5 (diff) | |
| download | rails-e1404ec824d263d25717468c6f4b73ee7b2bdf4c.tar.gz rails-e1404ec824d263d25717468c6f4b73ee7b2bdf4c.tar.bz2 rails-e1404ec824d263d25717468c6f4b73ee7b2bdf4c.zip | |
Rails.application should be set inside before_configuration hook
Fixes #14620
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/application.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 4be90a3f6c..8d080feb04 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -87,7 +87,7 @@ module Rails class << self def inherited(base) super - Rails.application ||= base.instance + base.instance end # Makes the +new+ method public. @@ -117,6 +117,8 @@ module Rails @railties = nil @message_verifiers = {} + Rails.application ||= self + add_lib_to_load_path! ActiveSupport.run_load_hooks(:before_configuration, self) |