aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-04-01 19:08:04 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-04-01 19:08:04 +0000
commitebc0a38d404e4125798618027ec30f8580634599 (patch)
tree284c3f63205cc33885c2ea7584efcd0bcf500a44
parent5fd7118cbcbdac7a5d4c82ea811a8d97b6ce6c10 (diff)
downloadrails-ebc0a38d404e4125798618027ec30f8580634599.tar.gz
rails-ebc0a38d404e4125798618027ec30f8580634599.tar.bz2
rails-ebc0a38d404e4125798618027ec30f8580634599.zip
Use --simple-prompt instead of --prompt-mode simple for console compatibility with Windows/Ruby 1.8.2 #4532 [starr@starrnhorne.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4118 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--activesupport/lib/active_support/core_ext/hash/indifferent_access.rb2
-rw-r--r--railties/CHANGELOG2
-rw-r--r--railties/lib/commands/console.rb2
3 files changed, 4 insertions, 2 deletions
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 d60b605942..472e3ab7d1 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 @@ module ActiveSupport #:nodoc:
end
end
end
-end \ No newline at end of file
+end
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"