diff options
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/Rakefile | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index dc6356056d..21a02dd4ab 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed that script/breakpointer didn't get the Ruby path rewritten as the other scripts #523 [brandt@kurowski.net] + * Fixed superclass mismatch and other controller related problems by not using dependency reloading for controllers. This means that controller hierarchies need to explicitly require the superclass if its not ApplicationController. Example: diff --git a/railties/Rakefile b/railties/Rakefile index c3cf562427..383a5b7a1f 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -218,7 +218,9 @@ end task :copy_gem_environment do cp "environments/shared_for_gem.rb", "#{PKG_DESTINATION}/config/environment.rb" - cp "bin/breakpointer_for_gem", "#{PKG_DESTINATION}/script/breakpointer" + dest_file = File.join(PKG_DESTINATION, 'script', 'breakpointer') + copy_with_rewritten_ruby_path(File.join('bin', 'breakpointer_for_gem'), dest_file) + chmod 0755, dest_file end |