diff options
| author | wycats <wycats@gmail.com> | 2010-04-10 17:22:52 -0400 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-04-10 17:22:52 -0400 |
| commit | 87f7093ee3306f417e1136d947eba200d40ff8e7 (patch) | |
| tree | ba70dbdaf67e12fc067bb5d8343d7681932452ef /railties/lib/rails/engine | |
| parent | ee8e9d548472fb8cb8792a569e579c6513be77d6 (diff) | |
| parent | 381f877bbbbf81d679f5be3b7ac7e961d41502bd (diff) | |
| download | rails-87f7093ee3306f417e1136d947eba200d40ff8e7.tar.gz rails-87f7093ee3306f417e1136d947eba200d40ff8e7.tar.bz2 rails-87f7093ee3306f417e1136d947eba200d40ff8e7.zip | |
Merge branch 'master' into docrails_master
Diffstat (limited to 'railties/lib/rails/engine')
| -rw-r--r-- | railties/lib/rails/engine/configuration.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/engine/configuration.rb b/railties/lib/rails/engine/configuration.rb index 28e7ef947d..c5411a0331 100644 --- a/railties/lib/rails/engine/configuration.rb +++ b/railties/lib/rails/engine/configuration.rb @@ -43,7 +43,7 @@ module Rails end def load_once_paths - @eager_load_paths ||= paths.load_once + @load_once_paths ||= paths.load_once end def load_paths |