diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d4d959b..c0fd0203 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,8 @@ # Changelog -## Unreleased +## Version 2.1.0 +* Support for setting the parent controller class [#903][] * Remove support for Ruby `< 3.1` * Remove support for Rails `< 7.0` * Test against Rails 8.0 @@ -241,6 +242,7 @@ _No changes_ * First release. Support to I18n, singleton controllers, polymorphic controllers, belongs_to, nested_belongs_to and url helpers [#873]: https://github.com/activeadmin/inherited_resources/pull/873 +[#903]: https://github.com/activeadmin/inherited_resources/pull/903 [#918]: https://github.com/activeadmin/inherited_resources/pull/918 [#921]: https://github.com/activeadmin/inherited_resources/pull/921 [#933]: https://github.com/activeadmin/inherited_resources/pull/933 diff --git a/Gemfile.lock b/Gemfile.lock index 61a2c6b9..86e29132 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - inherited_resources (2.0.1) + inherited_resources (2.1.0) actionpack (>= 7.0) has_scope (>= 0.6) railties (>= 7.0) @@ -119,13 +119,13 @@ GEM marcel (1.0.4) mini_mime (1.1.5) mini_portile2 (2.8.8) - minitest (5.25.2) + minitest (5.25.4) minitest-reporters (1.7.1) ansi builder minitest (>= 5.0) ruby-progressbar - mocha (2.6.1) + mocha (2.7.0) ruby2_keywords (>= 0.0.5) net-imap (0.5.1) date @@ -248,7 +248,7 @@ GEM unicode-emoji (~> 4.0, >= 4.0.4) unicode-emoji (4.0.4) uri (1.0.2) - useragent (0.16.10) + useragent (0.16.11) warning (1.4.0) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) @@ -278,4 +278,4 @@ DEPENDENCIES warning BUNDLED WITH - 2.5.22 + 2.5.23 diff --git a/gemfiles/rails_70/Gemfile.lock b/gemfiles/rails_70/Gemfile.lock index 7b2ec4cd..06faa4b2 100644 --- a/gemfiles/rails_70/Gemfile.lock +++ b/gemfiles/rails_70/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: ../.. specs: - inherited_resources (2.0.1) + inherited_resources (2.1.0) actionpack (>= 7.0) has_scope (>= 0.6) railties (>= 7.0) @@ -101,13 +101,13 @@ GEM method_source (1.1.0) mini_mime (1.1.5) mini_portile2 (2.8.8) - minitest (5.25.2) + minitest (5.25.4) minitest-reporters (1.7.1) ansi builder minitest (>= 5.0) ruby-progressbar - mocha (2.6.1) + mocha (2.7.0) ruby2_keywords (>= 0.0.5) net-imap (0.5.1) date @@ -212,4 +212,4 @@ DEPENDENCIES zeitwerk (~> 2.6.18) BUNDLED WITH - 2.5.22 + 2.5.23 diff --git a/gemfiles/rails_71/Gemfile.lock b/gemfiles/rails_71/Gemfile.lock index 7ef3e256..982ddd7f 100644 --- a/gemfiles/rails_71/Gemfile.lock +++ b/gemfiles/rails_71/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: ../.. specs: - inherited_resources (2.0.1) + inherited_resources (2.1.0) actionpack (>= 7.0) has_scope (>= 0.6) railties (>= 7.0) @@ -122,13 +122,13 @@ GEM marcel (1.0.4) mini_mime (1.1.5) mini_portile2 (2.8.8) - minitest (5.25.2) + minitest (5.25.4) minitest-reporters (1.7.1) ansi builder minitest (>= 5.0) ruby-progressbar - mocha (2.6.1) + mocha (2.7.0) ruby2_keywords (>= 0.0.5) mutex_m (0.3.0) net-imap (0.5.1) @@ -248,4 +248,4 @@ DEPENDENCIES zeitwerk (~> 2.6.18) BUNDLED WITH - 2.5.22 + 2.5.23 diff --git a/gemfiles/rails_72/Gemfile.lock b/gemfiles/rails_72/Gemfile.lock index b8372201..79e4be23 100644 --- a/gemfiles/rails_72/Gemfile.lock +++ b/gemfiles/rails_72/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: ../.. specs: - inherited_resources (2.0.1) + inherited_resources (2.1.0) actionpack (>= 7.0) has_scope (>= 0.6) railties (>= 7.0) @@ -116,13 +116,13 @@ GEM marcel (1.0.4) mini_mime (1.1.5) mini_portile2 (2.8.8) - minitest (5.25.2) + minitest (5.25.4) minitest-reporters (1.7.1) ansi builder minitest (>= 5.0) ruby-progressbar - mocha (2.6.1) + mocha (2.7.0) ruby2_keywords (>= 0.0.5) net-imap (0.5.1) date @@ -215,7 +215,7 @@ GEM timeout (0.4.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - useragent (0.16.10) + useragent (0.16.11) warning (1.4.0) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) @@ -242,4 +242,4 @@ DEPENDENCIES zeitwerk (~> 2.6.18) BUNDLED WITH - 2.5.22 + 2.5.23 diff --git a/lib/inherited_resources/version.rb b/lib/inherited_resources/version.rb index 04963380..579e7054 100644 --- a/lib/inherited_resources/version.rb +++ b/lib/inherited_resources/version.rb @@ -1,4 +1,4 @@ # frozen_string_literal: true module InheritedResources - VERSION = '2.0.1'.freeze + VERSION = '2.1.0'.freeze end