aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-06-25 14:38:42 -0300
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-06-26 22:21:18 -0300
commitfef781cac4cb6ff6482307f3c253bdc01d4bed82 (patch)
tree9f55262f39f2e1a5ce4f5d2dc92e03f42664dfcb /activemodel/lib
parent0ee6aa749cde21dad0e5f394a7feb3173f357d2f (diff)
downloadrails-fef781cac4cb6ff6482307f3c253bdc01d4bed82.tar.gz
rails-fef781cac4cb6ff6482307f3c253bdc01d4bed82.tar.bz2
rails-fef781cac4cb6ff6482307f3c253bdc01d4bed82.zip
Use default + merge! instead of reverse_merge
Since we're not directly requiring the reverse_merge extension, we can avoid another hash creation by using default_hash.merge! instead.
Diffstat (limited to 'activemodel/lib')
-rw-r--r--activemodel/lib/active_model/validations/acceptance.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/validations/acceptance.rb b/activemodel/lib/active_model/validations/acceptance.rb
index c49f831cae..43651094cf 100644
--- a/activemodel/lib/active_model/validations/acceptance.rb
+++ b/activemodel/lib/active_model/validations/acceptance.rb
@@ -4,7 +4,7 @@ module ActiveModel
module Validations
class AcceptanceValidator < EachValidator #:nodoc:
def initialize(options)
- super(options.reverse_merge(:allow_nil => true, :accept => "1"))
+ super({ :allow_nil => true, :accept => "1" }.merge!(options))
end
def validate_each(record, attribute, value)