Commit Graph

8 Commits

Author SHA1 Message Date
Ben Atkins deac77d570 Merge branch 'jruby'
Conflicts:
	.travis.yml
2013-03-26 12:34:38 -04:00
Ben Atkins abd633f5a9 Merge remote-tracking branch 'dwbutler/jruby' into jruby
Conflicts:
	lib/paper_trail/has_paper_trail.rb
	paper_trail.gemspec
	test/unit/serializer_test.rb
2013-03-26 10:54:33 -04:00
Ben Atkins 2e578d44dc Adding Ruby2 back onto .travis.yml but with failures allowed, as per req #210 2013-03-08 11:12:23 -05:00
Ben Atkins f5df2a656c Removing ruby 2.0 from .travis.yml since there are some compatibility issues with the current release of Rails 3.2 2013-03-07 11:15:41 -05:00
Piotr Usewicz 6e1845c450 Add Ruby 1.9.3 and 2.0.0 2013-03-07 06:50:37 +00:00
David Butler dbd277c4ca Test against JRuby in Travis CI 2013-01-03 13:23:22 -08:00
Ben Atkins 2b920906c2 Adding language declaration to .travis.yml 2012-11-27 15:59:21 -05:00
Andy Stewart 2f9aeb7294 Add Travis CI configuration. 2011-07-25 21:08:44 +01:00