aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-04-19 10:32:33 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-04-19 10:32:33 -0700
commit08c6df8532a1884050c8e9087e9fce9df6528ae2 (patch)
tree95c3a4279217cc21901ae2efc32219c12e9e5a8a
parentfc5090c937db4d3795aa97d9130747ab6a1de8b0 (diff)
parentc52c2682bf03192755ccf8c15ab641090815cacf (diff)
downloadrails-08c6df8532a1884050c8e9087e9fce9df6528ae2.tar.gz
rails-08c6df8532a1884050c8e9087e9fce9df6528ae2.tar.bz2
rails-08c6df8532a1884050c8e9087e9fce9df6528ae2.zip
Merge pull request #10267 from vipulnsward/use_destructive_method
symbolize_keys => symbolize_keys! on new hash; change sentence
-rw-r--r--actionpack/lib/action_view/helpers/date_helper.rb2
-rw-r--r--activesupport/lib/active_support/hash_with_indifferent_access.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index d3953c26b7..8fb5eb1548 100644
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -808,7 +808,7 @@ module ActionView
options[:max_years_allowed] = @options[:max_years_allowed] || 1000
if (options[:end] - options[:start]).abs > options[:max_years_allowed]
- raise ArgumentError, "There're too many years options to be built. Are you sure you haven't mistyped something? You can provide the :max_years_allowed parameter"
+ raise ArgumentError, "There are too many years options to be built. Are you sure you haven't mistyped something? You can provide the :max_years_allowed parameter."
end
build_options_and_select(:year, val, options)
diff --git a/activesupport/lib/active_support/hash_with_indifferent_access.rb b/activesupport/lib/active_support/hash_with_indifferent_access.rb
index 837db05dcc..1b20592e4c 100644
--- a/activesupport/lib/active_support/hash_with_indifferent_access.rb
+++ b/activesupport/lib/active_support/hash_with_indifferent_access.rb
@@ -223,7 +223,7 @@ module ActiveSupport
def deep_stringify_keys; dup end
undef :symbolize_keys!
undef :deep_symbolize_keys!
- def symbolize_keys; to_hash.symbolize_keys end
+ def symbolize_keys; to_hash.symbolize_keys! end
def deep_symbolize_keys; to_hash.deep_symbolize_keys end
def to_options!; self end