Merge branch 'activeadmin:master' into support-setting-parent-controller

.github/workflows/ci.yaml

@@ -23,16 +23,20 @@ jobs:
           - rails_61
           - rails_70
           - rails_71
+          - rails_72
+        exclude:
+          - ruby: "3.0"
+            rails: rails_72
     steps:
       - uses: actions/checkout@v4
       - name: Configure bundler (default)
         run: |
           echo "BUNDLE_GEMFILE=Gemfile" >> "$GITHUB_ENV"
-        if: matrix.rails == 'rails_71'
+        if: matrix.rails == 'rails_72'
       - name: Configure bundler (alternative)
         run: |
           echo "BUNDLE_GEMFILE=gemfiles/${{ matrix.rails }}/Gemfile" >> "$GITHUB_ENV"
-        if: matrix.rails != 'rails_71'
+        if: matrix.rails != 'rails_72'
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}

.github/workflows/github-actions-lint.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: tj-actions/changed-files@v44
+      - uses: tj-actions/changed-files@v45
         id: changed-files
         with:
           files: |

.github/workflows/rubocop.yml

@@ -14,7 +14,7 @@ jobs:
       BUNDLE_ONLY: ${{ vars.RUBOCOP_BUNDLE_ONLY || 'rubocop' }}
     steps:
       - uses: actions/checkout@v4
-      - uses: tj-actions/changed-files@v44
+      - uses: tj-actions/changed-files@v45
         id: changed-files
         with:
           files: |

.github/workflows/yaml-lint.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: tj-actions/changed-files@v44
+      - uses: tj-actions/changed-files@v45
         id: changed-files
         with:
           files: |

.rubocop.yml

@@ -2,6 +2,7 @@
 
 require:
   - rubocop-minitest
+  - rubocop-packaging
   - rubocop-performance
 
 AllCops:
@@ -215,6 +216,18 @@ Minitest/UnspecifiedException:
 Minitest/UselessAssertion:
   Enabled: true
 
+Packaging/BundlerSetupInTests:
+  Enabled: true
+
+Packaging/GemspecGit:
+  Enabled: true
+
+Packaging/RequireHardcodingLib:
+  Enabled: true
+
+Packaging/RequireRelativeHardcodingLib:
+  Enabled: true
+
 Performance:
   Enabled: true
 
@@ -373,5 +386,13 @@ Performance/UnfreezeString:
 Performance/UriDefaultParser:
   Enabled: true
 
+Style/Encoding:
+  Enabled: true
+
+Style/FrozenStringLiteralComment:
+  Enabled: true
+  Exclude:
+    - bin/console
+
 Style/HashSyntax:
   Enabled: true

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## Unreleased
+
+## Version 2.0.0
+
+* Test against Rails 7.2 [#921][].
+* Add frozen string literal to `InheritedResources` module [#933][].
+* Change return codes to new Responders defaults [#918][].
+
 ## Version 1.14.0
 
 * Remove upper bound dependency limits from gemspec.
@@ -145,7 +153,7 @@ _No changes_.
 * Added create_resource, update_resource and delete_resource hooks (thanks to Carlos Antonio da Silva).
 * Backported ActionController::Responder from Rails 3.
 * Added parent_url helper.
-* Added association_chain helper (as suggested by http://github.com/emmanuel).
+* Added association_chain helper (as suggested by https://github.com/emmanuel).
 
 ## Version 0.8
 
@@ -172,7 +180,7 @@ _No changes_.
 
 * Ensure that the default template is not rendered if the default_template_format is not accepted. This is somehow related with the security breach report:
 
-  http://www.rorsecurity.info/journal/2009/4/24/hidden-actions-render-templates.html
+  https://rorsecurity.info/journal/2009/4/24/hidden-actions-render-templates.html
 
   IR forbids based on mime types. For example: respond_to :html, :except => :index ensures that the index.html.erb view is not rendered, making your IR controllers safer.
 
@@ -225,3 +233,6 @@ _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
+[#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

Gemfile

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 source 'https://rubygems.org'
 
 gemspec path: '.'
 
 group :development do
-  gem 'rails', '~> 7.1.0'
+  gem 'rails', '~> 7.2.0'
 
   gem 'mocha'
   gem 'minitest'
@@ -17,5 +18,6 @@ end
 group :rubocop do
   gem 'rubocop'
   gem 'rubocop-minitest'
+  gem 'rubocop-packaging'
   gem 'rubocop-performance'
 end