Commit Graph

16 Commits

Author SHA1 Message Date
Ben Atkins 6be7470f11 Revert "Add temp workaround for Travis-CI & Ruby18 to get build passing again. Re: rubygems/rubygems#763"
This reverts commit 9f5829f3f9, which is no longer necessary now that RubyGems 2.2.1 has been released.
2014-01-07 15:48:38 -05:00
Ben Atkins 9f5829f3f9 Add temp workaround for Travis-CI & Ruby18 to get build passing again. Re: rubygems/rubygems#763 2014-01-06 13:05:08 -05:00
Ben Atkins 44f2380ec6 Removing before_install block from .travis.yml since it is no longer necessary 2013-10-21 16:05:27 -04: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 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 a1b30d4dc4 Tweaking .travis.yml to install bundler version to meet rails 4 dependency 2013-03-08 10:44:55 -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
Ben Atkins 5122d8daf7 Adding ruby 2.0 to .travis.yml 2013-03-07 10:58:09 -05:00
Piotr Usewicz 6e1845c450 Add Ruby 1.9.3 and 2.0.0 2013-03-07 06:50:37 +00:00
Chris Nicola 283f13139a Update .travis.yml to use ruby 1.9.3 since Rails requires it 2013-02-04 17:24:44 -08: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