aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib/active_model
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2010-02-25 13:07:48 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2010-02-25 13:07:48 -0800
commit2ba604950603302fd78bcefecfe043efaa8169dc (patch)
tree29c1028d678cef6d0fdd7831296f8052b19a0c12 /activemodel/lib/active_model
parent763f32ab47b96289a4d7b7107411a83164bf69de (diff)
downloadrails-2ba604950603302fd78bcefecfe043efaa8169dc.tar.gz
rails-2ba604950603302fd78bcefecfe043efaa8169dc.tar.bz2
rails-2ba604950603302fd78bcefecfe043efaa8169dc.zip
Accept array of attributes as arg also, like 2.3
Diffstat (limited to 'activemodel/lib/active_model')
-rw-r--r--activemodel/lib/active_model/validations.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/validations.rb b/activemodel/lib/active_model/validations.rb
index 7f6748a660..ba8648f8c9 100644
--- a/activemodel/lib/active_model/validations.rb
+++ b/activemodel/lib/active_model/validations.rb
@@ -137,7 +137,7 @@ module ActiveModel
def _merge_attributes(attr_names)
options = attr_names.extract_options!
- options.merge(:attributes => attr_names)
+ options.merge(:attributes => attr_names.flatten)
end
end