diff --git a/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb b/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb index d60b605942f40f556ffecf9ece3822eec61ebc4c..472e3ab7d1ca57c94a4a1206281ee4357689699b 100644 --- a/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb +++ b/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb @@ -76,4 +76,4 @@ def with_indifferent_access end end end -end \ No newline at end of file +end diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 875bc527a658132df2a6ffb70b3536db53e29cc8..e77b59d170093dd514e559df7374f88677ca617b 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 3cc9fcbdb15cf250b42d1c8cac4ffddbcf9587f4..ed0cc10de7e7807b512609044cc03c1768496258 100644 --- a/railties/lib/commands/console.rb +++ b/railties/lib/commands/console.rb @@ -22,4 +22,4 @@ else puts "Loading #{ENV['RAILS_ENV']} environment." end -exec "#{options[:irb]} #{libs} --prompt-mode simple" +exec "#{options[:irb]} #{libs} --simple-prompt"