From d81cc4c9315735e2f9fd56dc60291f73c623dc45 Mon Sep 17 00:00:00 2001 From: Jared Beck Date: Thu, 31 Jan 2019 00:57:11 -0500 Subject: [PATCH] Cherry-pick Release 10.2.0 from 10-stable --- CHANGELOG.md | 14 ++++++++++++++ README.md | 7 +++---- lib/paper_trail/version_number.rb | 2 +- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03195f81..39b10457 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,20 @@ recommendations of [keepachangelog.com](http://keepachangelog.com/). ### Added +- None + +### Fixed + +- None + +## 10.2.0 (2019-01-31) + +### Breaking Changes + +- None + +### Added + - Support ruby 2.6.0 - [#1182](https://github.com/paper-trail-gem/paper_trail/pull/1182) - Support rails 6.0.0.beta1 diff --git a/README.md b/README.md index e963934c..ec4778be 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ has been destroyed. | Version | Documentation | | -------------- | ------------- | | Unreleased | https://github.com/paper-trail-gem/paper_trail/blob/master/README.md | -| 10.1.0 | https://github.com/paper-trail-gem/paper_trail/blob/v10.1.0/README.md | +| 10.2.0 | https://github.com/paper-trail-gem/paper_trail/blob/v10.2.0/README.md | | 9.2.0 | https://github.com/paper-trail-gem/paper_trail/blob/v9.2.0/README.md | | 8.1.2 | https://github.com/paper-trail-gem/paper_trail/blob/v8.1.2/README.md | | 7.1.3 | https://github.com/paper-trail-gem/paper_trail/blob/v7.1.3/README.md | @@ -82,9 +82,8 @@ has been destroyed. | paper_trail | branch | ruby | activerecord | | -------------- | ---------- | -------- | ------------- | -| unreleased | master | >= 2.3.0 | >= 4.2, < 6 | -| 10.1 | 10-stable | >= 2.3.0 | >= 4.2, < 6 | -| 10.0 | 10-stable | >= 2.3.0 | >= 4.2, < 5.3 | +| unreleased | master | >= 2.3.0 | >= 4.2, < 6.1 | +| 10 | 10-stable | >= 2.3.0 | >= 4.2, < 6.1 | | 9 | 9-stable | >= 2.3.0 | >= 4.2, < 5.3 | | 8 | 8-stable | >= 2.2.0 | >= 4.2, < 5.2 | | 7 | 7-stable | >= 2.1.0 | >= 4.0, < 5.2 | diff --git a/lib/paper_trail/version_number.rb b/lib/paper_trail/version_number.rb index 4475b80b..348d5dd1 100644 --- a/lib/paper_trail/version_number.rb +++ b/lib/paper_trail/version_number.rb @@ -8,7 +8,7 @@ module PaperTrail # People are encouraged to use `PaperTrail.gem_version` instead. module VERSION MAJOR = 10 - MINOR = 1 + MINOR = 2 TINY = 0 # Set PRE to nil unless it's a pre-release (beta, rc, etc.)