Ben Atkins 38e05bc53e Merge remote-tracking branch 'bradleypriest/master' ... Conflicts: lib/paper_trail/has_paper_trail.rb lib/paper_trail/version.rb		2012-12-28 01:12:42 -05:00
..
dummy	Merge remote-tracking branch 'TylerRick/use_serialized_value_for_object_changes'	2012-12-17 15:40:15 -05:00
functional	Controller metadata methods (user_for_paper_trail and info_for_paper_trail) should be evaluated when paper trail is enabled for controller	2012-11-06 13:34:14 +05:30
integration	Convert to Rails 3 idioms.	2011-02-08 17:16:35 +00:00
support	Fix deprecation warning about Capybara	2012-03-08 14:20:55 -07:00
unit	Merge remote-tracking branch 'bradleypriest/master'	2012-12-28 01:12:42 -05:00
paper_trail_test.rb	Fix "originator" problem not working with inheritance.	2012-07-17 10:13:42 +03:00
test_helper.rb	Adjusting the :merge_metadata method on has_paper_trail.rb so that in the event that an attribute is being called upon to provide the value, and the attribute is changing, it will grab the current version of the attribute (what it was prior to the changes).	2012-10-10 19:39:55 -04:00