Commit Graph

5 Commits

Author SHA1 Message Date
Ben Atkins e1f033fcd5 Use ActiveRecord::VERSION::MAJOR for version comparisons isntead of invoking :to_f on the full version String 2014-01-08 14:17:42 -05:00
Ben Atkins 969f84a4ea Adjusting Travis CI config to cover ActiveRecord 3 and 4 and allow failures when appropriate, tweaked 3.0.gemfile so it can handle ruby18 and jruby 2013-08-01 14:59:58 -04:00
Ben Atkins 3c775aa6b3 Merge branch 'rails4'
Conflicts:
	README.md
	lib/paper_trail/has_paper_trail.rb
	lib/paper_trail/version.rb
	test/dummy/config/initializers/paper_trail.rb
	test/unit/model_test.rb
	test/unit/version_test.rb
2013-08-01 14:57:44 -04:00
Ben Atkins c2dbb1c154 Merge branch 'master' into rails4
Conflicts:
	.travis.yml
	Gemfile
2013-03-15 14:50:07 -04:00
Ben Atkins 01a1be4438 Added basic test coverage for a model that invokes for protection from mass assignment. 2013-02-07 15:27:29 -05:00