Jim Jones 53e753bd80 Changed the DangerousAttributeError exception message to include messaging that the conflict could be because of a conflicting attribute.		2014-09-10 21:40:00 -07:00
..
active_record	Changed the DangerousAttributeError exception message to include messaging that the conflict could be because of a conflicting attribute.	2014-09-10 21:40:00 -07:00
rails/generators	Merge pull request #16062 from sgrif/sg-required-generators	2014-08-17 22:57:21 -03:00
active_record.rb	Revert "Revert "Merge pull request #16059 from jenncoop/json-serialized-attr""	2014-07-15 08:43:18 -07:00