diff options
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/initializer.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 55b1a4d7ae..0b7eb50229 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Pass __FILE__ when evaluating plugins' init.rb. #2817 [james.adam@gmail.com] + * Better svn status matching for generators. #2814 [François Beausoleil <francois.beausoleil@gmail.com>, Blair Zajac <blair@orcaware.com>] * Don't reload routes until plugins have been loaded so they have a chance to extend the routing capabilities [DHH] diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index 082c14c634..69deedf179 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -306,7 +306,7 @@ module Rails config = configuration # Evaluate init.rb. - silence_warnings { eval(IO.read(init_path), binding) } if has_init + silence_warnings { eval(IO.read(init_path), binding, init_path) } if has_init # Add to set of loaded plugins. loaded_plugins << name |