diff options
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/rails_generator/generators/applications/app/app_generator.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 52c2e81fb1..8831c64815 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed db_schema_import when binary types are present #3101 [DHH] + * Fixed that MySQL enums should always be returned as strings #3501 [DHH] * Change has_many :through to use the :source option to specify the source association. :class_name is now ignored. [Rick Olson] diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb index 2a71c35599..1211b512d7 100644 --- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb +++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb @@ -93,7 +93,7 @@ class AppGenerator < Rails::Generator::Base def add_options!(opt) opt.separator '' opt.separator 'Options:' - opt.on("-r", "--ruby", + opt.on("-r", "--ruby", String, "Path to the Ruby binary of your choice.", "Default: #{DEFAULT_SHEBANG}") { |options[:shebang]| } |