Commit Graph

2 Commits

Author SHA1 Message Date
Mark J. Lehman
b1b253f5a8
Fix Rails 6.0 deprecation on class.parent (#2373)
* Fix Rails 6.0 deprecation on `class.parent`

* Update Changelog

* Switch travis to openJDK

* Lock bundler on appveyor

* Rejigger gemfile to fix sqlite issue

* Lock nokogiri for ruby < 2.4

* Use rubygems < 3 to fix travis

* Use specific bundler version and do not try to uninstall

Uninstalling bundler is not allowed since it is a default gem

* Lock rake for ruby < 2.2

* Downgrade rake further to support ruby 1.9.3

* Lock rake down further, and lock simplecov

* Fix rubocop/parser and minitest version deps in CI

* Lock sprockets version

* Try fixing jruby builds

* Try remove bad gem version for jruby on CI

* Try downgrading rubygems a different way

* Do not update rubygems on jruby

* Lock gems for jruby

* Fix sprockets version lock
2020-03-11 21:49:47 -05:00
Jan Wendt
a30f53de76 merge multiple nested associations 2016-03-30 08:39:40 +02:00