diff --git a/.travis.yml b/.travis.yml index 7fb18ec..0a16025 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,8 @@ services: rvm: - 2.3.5 - 2.4.3 - - 2.5.3 - - 2.6.0 + - 2.5.4 + - 2.6.2 - ruby-head matrix: diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b330a7..1cc8933 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Draper Changelog +## 3.1.0 +* Rails 6 support [#841](https://github.com/drapergem/draper/pull/841) +* Include ORM query methods in `CollectionDecorator` (e.g. `includes`) [#845](https://github.com/drapergem/draper/pull/845) +* Document the fix for view context leaking in specs [#847](https://github.com/drapergem/draper/pull/847) + ## 3.0.1 * Let `decorator_class` infer anonymous class decorator from superclass [#820](https://github.com/drapergem/draper/pull/820) * When inferring decorator fails, show original class instead of `ActiveRecord::Base` [#821](https://github.com/drapergem/draper/pull/821) diff --git a/lib/draper/version.rb b/lib/draper/version.rb index 9215425..03b9f5f 100644 --- a/lib/draper/version.rb +++ b/lib/draper/version.rb @@ -1,3 +1,3 @@ module Draper - VERSION = '3.0.1' + VERSION = '3.1.0' end