diff --git a/.gitignore b/.gitignore index 677c4659..541640ba 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .bundle +pkg diff --git a/CHANGELOG.md b/CHANGELOG.md index 9bc61c4c..bf7050cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Master (unreleased) +# Version 1.10.0 + +_No changes_. + # Version 1.10.0.rc1 * Preliminary support for Rails 6.0. diff --git a/Gemfile.lock b/Gemfile.lock index 729eb3cd..be603cbe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - inherited_resources (1.10.0.rc1) + inherited_resources (1.10.0) actionpack (>= 5.0, < 6.0) has_scope (~> 0.6) railties (>= 5.0, < 6.0) diff --git a/lib/inherited_resources/version.rb b/lib/inherited_resources/version.rb index 1a81c9d6..ba33b4d0 100644 --- a/lib/inherited_resources/version.rb +++ b/lib/inherited_resources/version.rb @@ -1,3 +1,3 @@ module InheritedResources - VERSION = '1.10.0.rc1'.freeze + VERSION = '1.10.0'.freeze end diff --git a/test/gemfiles/Gemfile-Rails-5-0.lock b/test/gemfiles/Gemfile-Rails-5-0.lock index 60f800f9..9fa49436 100644 --- a/test/gemfiles/Gemfile-Rails-5-0.lock +++ b/test/gemfiles/Gemfile-Rails-5-0.lock @@ -1,7 +1,7 @@ PATH remote: ../.. specs: - inherited_resources (1.10.0.rc1) + inherited_resources (1.10.0) actionpack (>= 5.0, < 6.0) has_scope (~> 0.6) railties (>= 5.0, < 6.0) diff --git a/test/gemfiles/Gemfile-Rails-5-1.lock b/test/gemfiles/Gemfile-Rails-5-1.lock index 5ba51233..8e86f2af 100644 --- a/test/gemfiles/Gemfile-Rails-5-1.lock +++ b/test/gemfiles/Gemfile-Rails-5-1.lock @@ -1,7 +1,7 @@ PATH remote: ../.. specs: - inherited_resources (1.10.0.rc1) + inherited_resources (1.10.0) actionpack (>= 5.0, < 6.0) has_scope (~> 0.6) railties (>= 5.0, < 6.0) diff --git a/test/gemfiles/Gemfile-Rails-6-0.lock b/test/gemfiles/Gemfile-Rails-6-0.lock index f6de96a6..3e802a44 100644 --- a/test/gemfiles/Gemfile-Rails-6-0.lock +++ b/test/gemfiles/Gemfile-Rails-6-0.lock @@ -1,7 +1,7 @@ PATH remote: ../.. specs: - inherited_resources (1.10.0.rc1) + inherited_resources (1.10.0) actionpack (>= 5.0, < 6.0) has_scope (~> 0.6) railties (>= 5.0, < 6.0)