Cherry-pick release 10.1.0 from 10-stable

.github/CONTRIBUTING.md

@@ -88,19 +88,22 @@ markdown-toc -i --maxdepth 3 --bullets='-' README.md
 
 ## Releases
 
-1. Set the version in lib/paper_trail/version_number.rb
+1. Checkout the appropriate stable branch, eg. `10-stable`
+1. Checkout a new branch, eg. `release-10.0.0`
+1. Set the version in `lib/paper_trail/version_number.rb`
 1. In the changelog,
-  - Replace "Unreleased" with the date in iso-8601 format
+  - Replace "Unreleased" with the date in ISO-8601 format
   - Add a new "Unreleased" section
 1. In the readme, update references to version number, including
   - documentation links table
-  - compatability table (major versions only)
-1. Commit
-1. git push origin 5-stable # or whatever branch
-1. Wait for CI to pass
+  - compatability table, if necessary
+1. git commit -am 'Release 10.0.0'
+1. git push origin release-10.0.0
+1. Pull request into `10-stable`
+1. git checkout 10-stable && git pull
 1. gem build paper_trail.gemspec
-1. gem push paper_trail-5.0.0.gem
-1. git tag -a -m "v5.0.0" "v5.0.0" # or whatever number
+1. gem push paper_trail-10.0.0.gem
+1. git tag -a -m "v10.0.0" "v10.0.0" # or whatever number
 1. git push --tags origin
 
 [1]: https://github.com/paper-trail-gem/paper_trail/blob/master/.github/ISSUE_TEMPLATE/bug_report.md

CHANGELOG.md

@@ -3,7 +3,21 @@
 This project follows [semver 2.0.0](http://semver.org/spec/v2.0.0.html) and the
 recommendations of [keepachangelog.com](http://keepachangelog.com/).
 
-## 10.1.0 (Unreleased)
+## Unreleased
+
+### Breaking Changes
+
+- None
+
+### Added
+
+- None
+
+### Fixed
+
+- None
+
+## 10.1.0 (2018-12-04)
 
 ### Breaking Changes
 
@@ -24,7 +38,7 @@ recommendations of [keepachangelog.com](http://keepachangelog.com/).
   ability to pass options, such as `scope` or `extend:` to the `has_many
   :versions` association macro.
 - [#1172](https://github.com/paper-trail-gem/paper_trail/pull/1172) -
-  Support rails 6.0.0 alpha.
+  Support rails 6.0.0.alpha
 
 ### Fixed
 

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.0.1         | https://github.com/paper-trail-gem/paper_trail/blob/v10.0.1/README.md |
+| 10.1.0         | https://github.com/paper-trail-gem/paper_trail/blob/v10.1.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 |
@@ -83,7 +83,8 @@ has been destroyed.
 | paper_trail    | branch     | ruby     | activerecord  |
 | -------------- | ---------- | -------- | ------------- |
 | unreleased     | master     | >= 2.3.0 | >= 4.2, < 6   |
-| 10             | 10-stable  | >= 2.3.0 | >= 4.2, < 5.3 |
+| 10.1           | 10-stable  | >= 2.3.0 | >= 4.2, < 6   |
+| 10.0           | 10-stable  | >= 2.3.0 | >= 4.2, < 5.3 |
 | 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 |

lib/paper_trail/version_number.rb

@@ -8,8 +8,8 @@ module PaperTrail
   # People are encouraged to use `PaperTrail.gem_version` instead.
   module VERSION
     MAJOR = 10
-    MINOR = 0
-    TINY = 1
+    MINOR = 1
+    TINY = 0
 
     # Set PRE to nil unless it's a pre-release (beta, rc, etc.)
     PRE = nil