diff options
| author | Steve Klabnik <steve@steveklabnik.com> | 2013-04-03 12:47:11 -0700 |
|---|---|---|
| committer | Steve Klabnik <steve@steveklabnik.com> | 2013-04-03 12:47:11 -0700 |
| commit | 81ed4f5ecbb45e96355a5ff3bd00a2c26ed60503 (patch) | |
| tree | acf514100bf1c15c2ddba70461862bd0c300e713 | |
| parent | db113d90caabf7a5d16aef4b61d41155eb5b86c6 (diff) | |
| parent | 4da888f38452d9727c77fd91cd7a267e4e1eec42 (diff) | |
| download | rails-81ed4f5ecbb45e96355a5ff3bd00a2c26ed60503.tar.gz rails-81ed4f5ecbb45e96355a5ff3bd00a2c26ed60503.tar.bz2 rails-81ed4f5ecbb45e96355a5ff3bd00a2c26ed60503.zip | |
Merge pull request #10080 from vipulnsward/railties_warning_fix_v2
add require to suppress warning; remove variable
| -rw-r--r-- | activesupport/lib/active_support/core_ext/big_decimal/conversions.rb | 1 | ||||
| -rw-r--r-- | railties/lib/rails/generators/named_base.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/big_decimal/conversions.rb b/activesupport/lib/active_support/core_ext/big_decimal/conversions.rb index 5dc5710c53..39b8cea807 100644 --- a/activesupport/lib/active_support/core_ext/big_decimal/conversions.rb +++ b/activesupport/lib/active_support/core_ext/big_decimal/conversions.rb @@ -1,4 +1,5 @@ require 'bigdecimal' +require 'bigdecimal/util' require 'yaml' class BigDecimal diff --git a/railties/lib/rails/generators/named_base.rb b/railties/lib/rails/generators/named_base.rb index 8b4f52bb3b..d891ba1215 100644 --- a/railties/lib/rails/generators/named_base.rb +++ b/railties/lib/rails/generators/named_base.rb @@ -40,7 +40,7 @@ module Rails def indent(content, multiplier = 2) spaces = " " * multiplier - content = content.each_line.map {|line| line.blank? ? line : "#{spaces}#{line}" }.join + content.each_line.map {|line| line.blank? ? line : "#{spaces}#{line}" }.join end def wrap_with_namespace(content) |