diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-12-05 02:17:52 -0800 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-12-05 02:17:52 -0800 |
| commit | 4af9be089c345c58b6eae462226ca7190bc6bb73 (patch) | |
| tree | ac6b4decd50097a5b634720b56f6396146574016 /railties/lib/rails | |
| parent | 129eac024382c7fbdad2007e86cf25778d5f6787 (diff) | |
| parent | 019df9887519701b321c668c1d27d5c0c26fee7a (diff) | |
| download | rails-4af9be089c345c58b6eae462226ca7190bc6bb73.tar.gz rails-4af9be089c345c58b6eae462226ca7190bc6bb73.tar.bz2 rails-4af9be089c345c58b6eae462226ca7190bc6bb73.zip | |
Merge pull request #8421 from claudiob/remove_unicode_blanks
Replace comments' non-breaking spaces with spaces [ci skip]
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/commands.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/commands.rb b/railties/lib/rails/commands.rb index b0fae13192..3ab2a3809e 100644 --- a/railties/lib/rails/commands.rb +++ b/railties/lib/rails/commands.rb @@ -60,7 +60,7 @@ when 'console' require 'rails/commands/console' options = Rails::Console.parse_arguments(ARGV) - # RAILS_ENV needs to be set before config/application is required + # RAILS_ENV needs to be set before config/application is required ENV['RAILS_ENV'] = options[:environment] if options[:environment] # shift ARGV so IRB doesn't freak diff --git a/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb index b4f466fbd8..60d202c5ef 100644 --- a/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb +++ b/railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb @@ -2,7 +2,7 @@ require 'rails/generators/rails/resource/resource_generator' module Rails module Generators - class ScaffoldGenerator < ResourceGenerator # :nodoc: + class ScaffoldGenerator < ResourceGenerator # :nodoc: remove_hook_for :resource_controller remove_class_option :actions |