diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-05-19 06:08:33 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-05-19 06:08:33 -0700 |
| commit | f20032fa15de8bc3d8d47993dbb64f759843120e (patch) | |
| tree | 019057f901294273e3cf4ea1856e801650103243 /activemodel | |
| parent | 0e207a499f82c7aefabcddad04fc562df727e663 (diff) | |
| parent | cf833b9d97f612ed2105ca4c467f03f812433320 (diff) | |
| download | rails-f20032fa15de8bc3d8d47993dbb64f759843120e.tar.gz rails-f20032fa15de8bc3d8d47993dbb64f759843120e.tar.bz2 rails-f20032fa15de8bc3d8d47993dbb64f759843120e.zip | |
Merge pull request #5678 from troyk/patch-1
Remove sort on attributes.keys
Diffstat (limited to 'activemodel')
| -rw-r--r-- | activemodel/lib/active_model/serialization.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/serialization.rb b/activemodel/lib/active_model/serialization.rb index 3751e4a741..6d8fd21814 100644 --- a/activemodel/lib/active_model/serialization.rb +++ b/activemodel/lib/active_model/serialization.rb @@ -74,7 +74,7 @@ module ActiveModel def serializable_hash(options = nil) options ||= {} - attribute_names = attributes.keys.sort + attribute_names = attributes.keys if only = options[:only] attribute_names &= Array(only).map(&:to_s) elsif except = options[:except] |