Merge pull request activeadmin-plugins#24 from libroreserve/master

Fix autoload issues (zeitwerk compatibility)
hole19 · Sep 6, 2022 · c760985 · c760985
2 parents 96431fd + a5f35b1
commit c760985
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -20,4 +20,4 @@ Metrics/AbcSize:
 Naming/MemoizedInstanceVariableName:
   Exclude:
     - 'app/models/active_admin/manageable_resource.rb'
-    - 'app/models/concerns/active_admin_role/role_based_authorizable.rb'
+    - 'lib/active_admin_role/role_based_authorizable.rb'
diff --git a/app/models/active_admin_role/dsl.rb → lib/active_admin_role/dsl.rb b/app/models/active_admin_role/dsl.rb → lib/active_admin_role/dsl.rb
@@ -1,3 +1,5 @@
+require "active_admin_role/role_based_authorizable"
+
 module ActiveAdminRole
   module Dsl
     def role_based_authorizable

diff --git a/lib/active_admin_role/engine.rb b/lib/active_admin_role/engine.rb
@@ -1,4 +1,5 @@
 require "rails/engine"
+require "active_admin_role/dsl"
 require "active_admin_role/active_admin/dsl"
 
 module ActiveAdminRole

diff --git a/...ive_admin_role/role_based_authorizable.rb → ...ive_admin_role/role_based_authorizable.rb b/...ive_admin_role/role_based_authorizable.rb → ...ive_admin_role/role_based_authorizable.rb