diff options
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/commands/console.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 875bc527a6..e77b59d170 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Use --simple-prompt instead of --prompt-mode simple for console compatibility with Windows/Ruby 1.8.2 #4532 [starr@starrnhorne.com] + * Make Rails::VERSION implicitly loadable #4491. [Nicholas Seckar] * Fixed rake rails:freeze:gems #4518 [benji@silverinsanity.com] diff --git a/railties/lib/commands/console.rb b/railties/lib/commands/console.rb index 3cc9fcbdb1..ed0cc10de7 100644 --- a/railties/lib/commands/console.rb +++ b/railties/lib/commands/console.rb @@ -22,4 +22,4 @@ if options[:sandbox] else puts "Loading #{ENV['RAILS_ENV']} environment." end -exec "#{options[:irb]} #{libs} --prompt-mode simple" +exec "#{options[:irb]} #{libs} --simple-prompt" |