diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index c7a217cd..37402514 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -102,7 +102,7 @@ DB=postgres bundle exec rake - Update version number(s) in the documentation links table 1. Commit 1. git tag -a -m "v5.0.0" "v5.0.0" # or whatever number -1. git push --tags origin master +1. git push --tags origin 5-stable # or whatever branch 1. gem build paper_trail.gemspec 1. gem push paper_trail-5.0.0.gem diff --git a/CHANGELOG.md b/CHANGELOG.md index ec1f34f6..1916c7b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,24 @@ recommendations of [keepachangelog.com](http://keepachangelog.com/). ### Fixed +## 5.2.2 (2016-09-08) + +### Breaking Changes + +- None + +### Deprecated + +- [#863](https://github.com/airblade/paper_trail/pull/863) + PaperTrail.timestamp_field= deprecated without replacement. + See [#861](https://github.com/airblade/paper_trail/pull/861) for discussion. + +### Added + +- None + +### Fixed + ## 5.2.1 (2016-09-02) ### Breaking Changes diff --git a/README.md b/README.md index dbd21c5e..3b78f8e6 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ has been destroyed. | Version | Documentation | | -------------- | ------------- | | Unreleased | https://github.com/airblade/paper_trail/blob/master/README.md | -| 5.2.1 | https://github.com/airblade/paper_trail/blob/v5.2.1/README.md | +| 5.2.2 | https://github.com/airblade/paper_trail/blob/v5.2.2/README.md | | 4.2.0 | https://github.com/airblade/paper_trail/blob/v4.2.0/README.md | | 3.0.9 | https://github.com/airblade/paper_trail/blob/v3.0.9/README.md | | 2.7.2 | https://github.com/airblade/paper_trail/blob/v2.7.2/README.md | diff --git a/lib/paper_trail/version_number.rb b/lib/paper_trail/version_number.rb index cf9b2f19..c733357f 100644 --- a/lib/paper_trail/version_number.rb +++ b/lib/paper_trail/version_number.rb @@ -3,7 +3,7 @@ module PaperTrail module VERSION MAJOR = 5 MINOR = 2 - TINY = 1 + TINY = 2 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".").freeze