activeadmin 2.13.0 → 2.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 170a59df9471df04e568a2ae1cc4dab8ff58c28fd28a6861a5e87ba596a4e913
-  data.tar.gz: ff345b66e5c18bc94b2a9394d0a633ebe12cce3f7c94b5119ece2b54bcf86836
+  metadata.gz: e192ee32c6a28d748f4fe6a3c82aba50933295ca915ccb3b5d4f283749dd8ae4
+  data.tar.gz: b3440f204e78159fbff127db9085c81d921a23aacc11828dc1a95c54e1291096
 SHA512:
-  metadata.gz: 558b34213e3a1af076814008a337ed3d7a66fa328c33bb460020f28595f4e4898e815752dde54c8b41ab6fa687989e7c4d0d8cd58113e736bdafe3943b3c3026
-  data.tar.gz: bb0f39fecd17ef5bb0063aaa64cf2ee2684fa52b19faf7b2e37fc273484554ad97a686972f5d5baa02cbd8d785efd9de384769e86b2083f5a2a6c591381d573d
+  metadata.gz: b757b6e53f0385ac472b370b92e9cfff96ad10a04551322c27d3fde495b4f5a8f43d6c54ff19d6d32ca7d39db631759c3d8a76a491ad27d7ba38490ecdbce7ab
+  data.tar.gz: 03a6f3c614b350d6fafc130c1aebf31f0ba854ef06304bac52800cce61ce7dc26a674f07f2ead5032e89740e9f7e016bb1619f91e1e08e944f923ce5c76301c2

data/CHANGELOG.md

@@ -2,6 +2,45 @@
 
 ## Unreleased
 
+## 2.14.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.13.1..v2.14.0)
+
+### Enhancements
+
+* Add csp_meta_tag to layout. [#7986] by [@javierjulio]
+* Update config.register_javascript with options support. [#7002] by [@lanzhiheng]
+* Use `csrf_meta_tags` in place of singular version. [#7985] by [@javierjulio]
+* Allow different new and edit rules in authorization adapters. [#6535] by [@timwis]
+
+### Bug Fixes
+
+* Fix form layout for hints and checkboxes. [#7772] by [@JewelSam]
+* Update filters disabled error to include specific action. [#6195] by [@javawizard]
+* Fix Comments controller destroy declaration. [#6482] by [@bliof]
+* Stop pagination elements from overflowing outside of panel container. [#7599] by [@ray-curran]
+
+### Translation Improvements
+
+* Update vi locale with more translations. [#7984] by [@rs-phunt]
+* Update zh-CN locale with multiple corrections. [#7944] by [@hfl]
+* Fix typo in Vietnamese locale for filter text. [#7920] by [@tvziet]
+* Improve French translation. [#7653] by [@cprodhomme]
+
+### Documentation
+
+* Add more documentation about PORO decorator requirements. [#7556] by [@sanfrecce-osaka]
+* Add Load Paths docs to the active_admin.rb template. [#7541] by [@gabo-cs]
+
+### Performance
+
+* Removes docs from exported gem. [#7013] by [@brunoarueira]
+
+## 2.13.1 [☰](https://github.com/activeadmin/activeadmin/compare/v2.13.0..v2.13.1)
+
+### Bug Fixes
+
+* Honor load paths order when loading admin files. [#7488] by [@tf]
+* Fix passing expected hash payload argument. [#7487] by [@ispyropoulos]
+
 ## 2.13.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.12.0..v2.13.0)
 
 ### Documentation
@@ -736,6 +775,7 @@ Please check [0-6-stable] for previous changes.
 [#6099]: https://github.com/activeadmin/activeadmin/pull/6099
 [#6124]: https://github.com/activeadmin/activeadmin/pull/6124
 [#6149]: https://github.com/activeadmin/activeadmin/pull/6149
+[#6195]: https://github.com/activeadmin/activeadmin/pull/6195
 [#6198]: https://github.com/activeadmin/activeadmin/pull/6198
 [#6210]: https://github.com/activeadmin/activeadmin/pull/6210
 [#6221]: https://github.com/activeadmin/activeadmin/pull/6221
@@ -750,8 +790,10 @@ Please check [0-6-stable] for previous changes.
 [#6451]: https://github.com/activeadmin/activeadmin/pull/6451
 [#6460]: https://github.com/activeadmin/activeadmin/pull/6460
 [#6462]: https://github.com/activeadmin/activeadmin/pull/6462
+[#6482]: https://github.com/activeadmin/activeadmin/pull/6482
 [#6487]: https://github.com/activeadmin/activeadmin/pull/6487
 [#6523]: https://github.com/activeadmin/activeadmin/pull/6523
+[#6535]: https://github.com/activeadmin/activeadmin/pull/6535
 [#6536]: https://github.com/activeadmin/activeadmin/pull/6536
 [#6548]: https://github.com/activeadmin/activeadmin/pull/6548
 [#6583]: https://github.com/activeadmin/activeadmin/pull/6583
@@ -766,6 +808,8 @@ Please check [0-6-stable] for previous changes.
 [#6936]: https://github.com/activeadmin/activeadmin/pull/6936
 [#6954]: https://github.com/activeadmin/activeadmin/pull/6954
 [#6959]: https://github.com/activeadmin/activeadmin/pull/6959
+[#7002]: https://github.com/activeadmin/activeadmin/pull/7002
+[#7013]: https://github.com/activeadmin/activeadmin/pull/7013
 [#7095]: https://github.com/activeadmin/activeadmin/pull/7095
 [#7127]: https://github.com/activeadmin/activeadmin/pull/7127
 [#7144]: https://github.com/activeadmin/activeadmin/pull/7144
@@ -789,6 +833,18 @@ Please check [0-6-stable] for previous changes.
 [#7475]: https://github.com/activeadmin/activeadmin/pull/7475
 [#7476]: https://github.com/activeadmin/activeadmin/pull/7476
 [#7479]: https://github.com/activeadmin/activeadmin/pull/7479
+[#7487]: https://github.com/activeadmin/activeadmin/pull/7487
+[#7488]: https://github.com/activeadmin/activeadmin/pull/7488
+[#7541]: https://github.com/activeadmin/activeadmin/pull/7541
+[#7556]: https://github.com/activeadmin/activeadmin/pull/7556
+[#7599]: https://github.com/activeadmin/activeadmin/pull/7599
+[#7653]: https://github.com/activeadmin/activeadmin/pull/7653
+[#7772]: https://github.com/activeadmin/activeadmin/pull/7772
+[#7920]: https://github.com/activeadmin/activeadmin/pull/7920
+[#7944]: https://github.com/activeadmin/activeadmin/pull/7944
+[#7984]: https://github.com/activeadmin/activeadmin/pull/7984
+[#7985]: https://github.com/activeadmin/activeadmin/pull/7985
+[#7986]: https://github.com/activeadmin/activeadmin/pull/7986
 
 [@1000ship]: https://github.com/1000ship
 [@5t111111]: https://github.com/5t111111
@@ -803,8 +859,10 @@ Please check [0-6-stable] for previous changes.
 [@amiuhle]: https://github.com/amiuhle
 [@andreslemik]: https://github.com/andreslemik
 [@bartoszkopinski]: https://github.com/bartoszkopinski
+[@bliof]: https://github.com/bliof
 [@blocknotes]: https://github.com/blocknotes
 [@bolshakov]: https://github.com/bolshakov
+[@brunoarueira]: https://github.com/brunoarueira
 [@brunvez]: https://github.com/brunvez
 [@buren]: https://github.com/buren
 [@chancancode]: https://github.com/chancancode
@@ -826,22 +884,26 @@ Please check [0-6-stable] for previous changes.
 [@Fivell]: https://github.com/Fivell
 [@Fs00]: https://github.com/Fs00
 [@fuzziness]: https://github.com/fuzziness
+[@gabo-cs]: https://github.com/gabo-cs
 [@giapnhdev]: https://github.com/giapnhdev
 [@gigorok]: https://github.com/gigorok
 [@glebtv]: https://github.com/glebtv
 [@gonzedge]: https://github.com/gonzedge
 [@guigs]: https://github.com/guigs
 [@HappyKadaver]: https://github.com/HappyKadaver
+[@hfl]: https://github.com/hfl
 [@imcvampire]: https://github.com/imcvampire
 [@innparusu95]: https://github.com/innparusu95
 [@ionut998]: https://github.com/ionut998
 [@irmela]: https://github.com/irmela
+[@ispyropoulos]: https://github.com/ispyropoulos
 [@Ivanov-Anton]: https://github.com/Ivanov-Anton
 [@jasl]: https://github.com/jasl
 [@javawizard]: https://github.com/javawizard
 [@javierjulio]: https://github.com/javierjulio
 [@jawa]: https://github.com/jawa
 [@jaynetics]: https://github.com/jaynetics
+[@JewelSam]: https://github.com/JewelSam
 [@JiiHu]: https://github.com/JiiHu
 [@jiikko]: https://github.com/jiikko
 [@johnnyshields]: https://github.com/johnnyshields
@@ -855,6 +917,7 @@ Please check [0-6-stable] for previous changes.
 [@Kris-LIBIS]: https://github.com/Kris-LIBIS
 [@krzcho]: https://github.com/krzcho
 [@kwent]: https://github.com/kwent
+[@lanzhiheng]: https://github.com/lanzhiheng
 [@leio10]: https://github.com/leio10
 [@littleforest]: https://github.com/littleforest
 [@Looooong]: https://github.com/Looooong
@@ -877,11 +940,14 @@ Please check [0-6-stable] for previous changes.
 [@PChambino]: https://github.com/PChambino
 [@potatosalad]: https://github.com/potatosalad
 [@pranas]: https://github.com/pranas
+[@ray-curran]: https://github.com/ray-curran
 [@renotocn]: https://github.com/renotocn
 [@rn0rno]: https://github.com/rn0rno
 [@RobinvanderVliet]: https://github.com/RobinvanderVliet
 [@rogerkk]: https://github.com/rogerkk
 [@roramirez]: https://github.com/roramirez
+[@rs-phunt]: https://github.com/rs-phunt
+[@sanfrecce-osaka]: https://github.com/sanfrecce-osaka
 [@seanlinsley]: https://github.com/seanlinsley
 [@sergey-alekseev]: https://github.com/sergey-alekseev
 [@sgara]: https://github.com/sgara
@@ -894,12 +960,15 @@ Please check [0-6-stable] for previous changes.
 [@stereoscott]: https://github.com/stereoscott
 [@tagliala]: https://github.com/tagliala
 [@taralbass]: https://github.com/taralbass
+[@tf]: https://github.com/tf
 [@tiagotex]: https://github.com/tiagotex
 [@timoschilling]: https://github.com/timoschilling
 [@TimPetricola]: https://github.com/TimPetricola
+[@timwis]: https://github.com/timwis
 [@tomgilligan]: https://github.com/tomgilligan
 [@TonyArra]: https://github.com/TonyArra
 [@tordans]: https://github.com/tordans
+[@tvziet]: https://github.com/tvziet
 [@utkarsh2102]: https://github.com/utkarsh2102
 [@varyonic]: https://github.com/varyonic
 [@vcsjones]: https://github.com/vcsjones

data/CONTRIBUTING.md

@@ -25,8 +25,7 @@ git checkout -b 325-add-japanese-translations
 
 ### Get the test suite running
 
-Make sure you're using a recent ruby and have the `bundler` gem installed, at
-least version `1.14.3`.
+Make sure you're using a recent Ruby version.
 
 You'll also need chrome installed in order to run cucumber scenarios.
 
@@ -56,8 +55,8 @@ Now you should be able to run the entire suite using:
 bin/rake
 ```
 
-The test run will generate a sample Rails application in `tmp/test_apps` to run the
-tests against.
+The task will generate a sample Rails application in `tmp/test_apps` to run the
+test suite against.
 
 If you want to test against a Rails version different from the latest, make sure
 you use the correct Gemfile, for example:

data/README.md

@@ -95,8 +95,8 @@ Thanks to [Open Collective][opencollective contributors] and all our Open Collec
 [rubygems]: https://rubygems.org/gems/activeadmin
 [actions_badge]: https://github.com/activeadmin/activeadmin/workflows/ci/badge.svg
 [actions]: https://github.com/activeadmin/activeadmin/actions
-[coverage_badge]: https://api.codeclimate.com/v1/badges/779e407d22bacff19733/test_coverage
-[coverage]: https://codeclimate.com/github/activeadmin/activeadmin/test_coverage
+[coverage_badge]: https://codecov.io/gh/activeadmin/activeadmin/branch/master/graph/badge.svg?token=NAjeBdkQXW
+[coverage]: https://codecov.io/gh/activeadmin/activeadmin
 [inch_badge]: http://inch-ci.org/github/activeadmin/activeadmin.svg?branch=master
 [inch]: http://inch-ci.org/github/activeadmin/activeadmin
 [tidelift_badge]: https://tidelift.com/badges/github/activeadmin/activeadmin

data/app/assets/javascripts/active_admin/base.js

@@ -474,7 +474,7 @@
     _setPrototypeOf(subClass, superClass);
   }
   function _setPrototypeOf(o, p) {
-    _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {
+    _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) {
       o.__proto__ = p;
       return o;
     };
@@ -518,7 +518,4 @@
   }
   exports.ModalDialog = ModalDialog;
   exports.modal_dialog = modal_dialog;
-  Object.defineProperty(exports, "__esModule", {
-    value: true
-  });
 });

data/app/assets/stylesheets/active_admin/_forms.scss

@@ -171,7 +171,7 @@ form {
     &.boolean {
       min-height: 1.1em;
       label {
-        width: 80%;
+        width: 100%;
         padding-left:20%;
         padding-right: 10px;
         text-transform: none !important;

data/app/assets/stylesheets/active_admin/structure/_footer.scss

@@ -9,6 +9,11 @@
 }
 
 // -------------------------------------- Index Footer (Under Table)
-#index_footer { padding-top: 5px; text-align: right; font-size: 0.85em; }
+#index_footer {
+  @include clearfix;
+  padding-top: 5px;
+  text-align: right;
+  font-size: 0.85em;
+}
 
 .index_content { clear: both; }

data/app/views/layouts/active_admin_logged_out.html.erb

@@ -12,11 +12,11 @@
       <%= stylesheet_link_tag style, **options %>
     <% end %>
   <% end %>
-  <% ActiveAdmin.application.javascripts.each do |path| %>
+  <% ActiveAdmin.application.javascripts.each do |path, options| %>
     <% if ActiveAdmin.application.use_webpacker %>
-      <%= javascript_pack_tag path %>
+      <%= javascript_pack_tag path, **options %>
     <% else %>
-      <%= javascript_include_tag path %>
+      <%= javascript_include_tag path, **options %>
     <% end %>
   <% end %>
 
@@ -26,7 +26,8 @@
     <%= tag(:meta, name: name, content: content) %>
   <% end %>
 
-  <%= csrf_meta_tag %>
+  <%= csrf_meta_tags %>
+  <%= csp_meta_tag %>
 </head>
 <body class="active_admin logged_out <%= controller.action_name %>">
 <div id="wrapper">

data/config/locales/fr.yml

@@ -38,9 +38,9 @@ fr:
         to: "À"
     search_status:
       headline: "Statut de la recherche :"
-      current_scope: "Etendu du filtre :"
+      current_scope: "Périmètre :"
       current_filters: "Filtres actuels :"
-      no_current_filters: "Aucun filtres"
+      no_current_filters: "Aucun filtre"
     status_tag:
       "yes": "Oui"
       "no": "Non"
@@ -52,7 +52,7 @@ fr:
       filters: "Filtres"
       search_status: "Statut de la recherche"
     pagination:
-      empty: "Aucun %{model} trouvé"
+      empty: "Aucun(e) %{model} trouvé(e)"
       one: "Affichage de <b>1</b> %{model}"
       one_page: "Affichage des <b>%{n}</b> %{model}"
       multiple: "Affichage de %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> sur un total de <b>%{total}</b>"

data/config/locales/vi.yml

@@ -1,4 +1,20 @@
 vi:
+  activerecord:
+    models:
+      comment:
+        one: "Bình luận"
+        other: "Các bình luận"
+      active_admin/comment:
+        one: "Bình luận"
+        other: "Các bình luận"
+    attributes:
+      active_admin/comment:
+        author_type: "Loại tác giả"
+        body: "Nội dung"
+        created_at: "Đã tạo"
+        namespace: "Namespace"
+        resource_type: "Resource type"
+        updated_at: "Đã cập nhật"
   active_admin:
     dashboard: Bảng điều khiển
     dashboard_welcome:
@@ -21,6 +37,7 @@ vi:
     has_many_new: "Thêm mới %{model}"
     has_many_delete: "Xóa"
     has_many_remove: "Hủy bỏ"
+    move: "Di chuyển"
     filters:
       buttons:
         filter: "Lọc"
@@ -36,10 +53,12 @@ vi:
         lteq_datetime: "Nhỏ hơn hoặc bằng"
         from: "Từ"
         to: "Đến"
+    scopes:
+      all: "Tất cả"
     search_status:
       headline: "Danh sách tìm kiếm:"
       current_scope: "Phạm vi:"
-      current_filters: "Bộ lộc hiện tại:"
+      current_filters: "Bộ lọc hiện tại:"
       no_current_filters: "Không có"
     status_tag:
       "yes": "Có"
@@ -47,7 +66,7 @@ vi:
       "unset": "Không Có"
     main_content: "Xin bổ sung %{model}#main_content để hiển thị nội dung."
     logout: "Đăng xuất"
-    powered_by: "Powered by %{active_admin} %{version}"
+    powered_by: "Bản quyền bởi %{active_admin} %{version}"
     sidebars:
       filters: "Bộ Lọc"
       search_status: "Trạng thái tìm kiếm"
@@ -75,12 +94,13 @@ vi:
         one: "Đã xóa thành công 1 %{model}"
         other: "Đã xóa thành công %{count} %{plural_model}"
       selection_toggle_explanation: "(Thay đổi lựa chọn)"
-      action_label: "%{title} được chọn"
+      action_label: "%{title} đã được chọn"
       labels:
         destroy: "Xóa"
     comments:
       created_at: "Đã tạo"
       resource_type: "Resource Type"
+      author_type: "Loại tác giả"
       body: "Nội dung"
       author: "Tác giả"
       add: "Thêm bình luận"
@@ -117,15 +137,22 @@ vi:
         title: "Thay đổi mật khẩu của bạn"
         submit: "Thay đổi mật khẩu của tôi"
       unlock:
-        title: "Gởi lại hướng dẫn mở khoá"
-        submit: "Gởi lại hướng dẫn mở khoá"
+        title: "Gửi lại hướng dẫn mở khoá"
+        submit: "Gửi lại hướng dẫn mở khoá"
       resend_confirmation_instructions:
-        title: "Gởi lại hướng dẫn xác nhận"
-        submit: "Gởi lại hướng dẫn xác nhận"
+        title: "Gửi lại hướng dẫn xác nhận"
+        submit: "Gửi lại hướng dẫn xác nhận"
       links:
+        sign_up: "Đăng ký"
         sign_in: "Đăng nhập"
         forgot_your_password: "Quên mật khẩu của bạn?"
         sign_in_with_omniauth_provider: "Đăng nhập với %{provider}"
+        resend_unlock_instructions: "Gửi lại hướng dẫn mở khoá"
+        resend_confirmation_instructions: "Gửi lại hướng dẫn xác nhận"
+    unsupported_browser:
+      headline: "Vui lòng lưu ý rằng ActiveAdmin không còn hỗ trợ trên Internet Explorer các phiên bản 8 và thấp hơn."
+      recommendation: "Chúng tôi khuyên bạn hãy vào <a href=\"http://browsehappy.com/\">nâng cấp trình duyệt của bạn </a> để cải thiện trải nghiệm của bạn."
+      turn_off_compatibility_view: "Nếu bạn đang sử dụng IE 9 hoặc mới hơn, hãy chắc chắn bạn <a href=\"https://support.microsoft.com/en-us/help/17471\">tắt \"Compatibility View\"</a>."
     access_denied:
       message: "Bạn không có quyền thực hiện tính năng này"
     index_list:

data/config/locales/zh-CN.yml

@@ -1,4 +1,20 @@
 "zh-CN":
+  activerecord:
+    models:
+      comment:
+        one: "评论"
+        other: "评论"
+      active_admin/comment:
+        one: "评论"
+        other: "评论"
+    attributes:
+      active_admin/comment:
+        author_type: "作者类型"
+        body: "内容"
+        created_at: "创建"
+        namespace: "Namespace"
+        resource_type: "Resource 类型"
+        updated_at: "更新"
   active_admin:
     dashboard: "控制面板"
     dashboard_welcome:
@@ -8,8 +24,8 @@
     edit: "编辑"
     delete: "删除"
     delete_confirmation: "确定删除?"
-    create_another: "新建另一个%{model}"
-    new_model: "新建%{model}"
+    create_another: "新增另一个%{model}"
+    new_model: "新增%{model}"
     edit_model: "编辑%{model}"
     delete_model: "删除%{model}"
     details: "%{model}详情"
@@ -17,10 +33,11 @@
     empty: "未定义"
     previous: "上一个"
     next: "下一个"
-    download: "下载:"
-    has_many_new: "新建一个%{model}"
+    download: "下载："
+    has_many_new: "新增一个%{model}"
     has_many_delete: "删除"
     has_many_remove: "清除"
+    move: "移动"
     filters:
       buttons:
         filter: "过滤"
@@ -28,26 +45,28 @@
       predicates:
         contains: "包含"
         equals: "等于"
-        starts_with: "开头"
-        ends_with: "完与"
+        starts_with: "始于"
+        ends_with: "止于"
         greater_than: "大于"
         less_than: "小于"
         gteq_datetime: "大于等于"
         lteq_datetime: "小于等于"
         from: "起"
         to: "止"
+    scopes:
+      all: "所有"
     search_status:
       headline: "搜索条件："
-      current_scope: "搜索范围："
+      current_scope: "范围："
       current_filters: "过滤条件："
       no_current_filters: "无"
     status_tag:
       "yes": "是"
       "no": "否"
       "unset": "否"
-    main_content: "请执行 %{model}#main_content 来显示内容."
+    main_content: "请执行 %{model}#main_content 来显示内容。"
     logout: "退出"
-    powered_by: "Powered by %{active_admin} %{version}"
+    powered_by: "构建程序为 %{active_admin} %{version}"
     sidebars:
       filters: "所有条件"
       search_status: "搜索条件"
@@ -63,14 +82,14 @@
         other: "条目"
     any: "任何"
     blank_slate:
-      content: "暂时还没有%{resource_name}."
-      link: "新建一个"
+      content: "暂时还没有%{resource_name}。"
+      link: "新增一个"
     dropdown_actions:
-      button_label: "行动"
+      button_label: "操作"
     batch_actions:
       button_label: "批处理"
-      default_confirmation: "你确定你要这样做？"
-      delete_confirmation: "你确定要删除这些%{plural_model}?"
+      default_confirmation: "你确定要这样做？"
+      delete_confirmation: "你确定要删除这些%{plural_model}？"
       succesfully_destroyed:
         one: "成功删除 1 %{model}"
         other: "成功删除 %{count} %{plural_model}"
@@ -92,7 +111,7 @@
       author_missing: "匿名"
       title_content: "(%{count})条评论"
       errors:
-        empty_text: "评论保存失败，内空不能为空."
+        empty_text: "评论保存失败，内空不能为空。"
     devise:
       username:
         title: "用户名"
@@ -121,8 +140,8 @@
         title: "重新发送送解锁命令"
         submit: "重新发送送解锁命令"
       resend_confirmation_instructions:
-        title: " 重新发送确认指示"
-        submit: " 重新发送确认指示"
+        title: " 重新发送确认说明"
+        submit: " 重新发送确认说明"
       links:
         sign_up: "注册"
         sign_in: "登录"

data/lib/active_admin/application.rb

@@ -76,7 +76,7 @@ module ActiveAdmin
 
       namespace = namespaces[name.to_sym] ||= begin
         namespace = Namespace.new(self, name)
-        ActiveSupport::Notifications.instrument ActiveAdmin::Namespace::RegisterEvent, namespace
+        ActiveSupport::Notifications.instrument ActiveAdmin::Namespace::RegisterEvent, { active_admin_namespace: namespace }
         namespace
       end
 
@@ -112,10 +112,10 @@ module ActiveAdmin
     # To reload everything simply call `ActiveAdmin.unload!`
     def load!
       unless loaded?
-        ActiveSupport::Notifications.instrument BeforeLoadEvent, self # before_load hook
+        ActiveSupport::Notifications.instrument BeforeLoadEvent, { active_admin_application: self } # before_load hook
         files.each { |file| load file } # load files
         namespace(default_namespace) # init AA resources
-        ActiveSupport::Notifications.instrument AfterLoadEvent, self # after_load hook
+        ActiveSupport::Notifications.instrument AfterLoadEvent, { active_admin_application: self } # after_load hook
         @@loaded = true
       end
     end
@@ -126,7 +126,7 @@ module ActiveAdmin
 
     # Returns ALL the files to be loaded
     def files
-      load_paths.flatten.compact.uniq.flat_map { |path| Dir["#{path}/**/*.rb"] }.sort
+      load_paths.flatten.compact.uniq.flat_map { |path| Dir["#{path}/**/*.rb"].sort }
     end
 
     # Creates all the necessary routes for the ActiveAdmin configurations

data/lib/active_admin/asset_registration.rb

@@ -14,12 +14,12 @@ module ActiveAdmin
       stylesheets.clear
     end
 
-    def register_javascript(name)
-      javascripts.add name
+    def register_javascript(path, options = {})
+      javascripts[path] = options
     end
 
     def javascripts
-      @javascripts ||= Set.new
+      @javascripts ||= {}
     end
 
     def clear_javascripts!

data/lib/active_admin/authorization_adapter.rb

@@ -4,7 +4,9 @@ module ActiveAdmin
   # Default Authorization permissions for Active Admin
   module Authorization
     READ = :read
+    NEW = :new
     CREATE = :create
+    EDIT = :edit
     UPDATE = :update
     DESTROY = :destroy
   end

data/lib/active_admin/base_controller/authorization.rb

@@ -7,9 +7,9 @@ module ActiveAdmin
       ACTIONS_DICTIONARY = {
         index: ActiveAdmin::Authorization::READ,
         show: ActiveAdmin::Authorization::READ,
-        new: ActiveAdmin::Authorization::CREATE,
+        new: ActiveAdmin::Authorization::NEW,
         create: ActiveAdmin::Authorization::CREATE,
-        edit: ActiveAdmin::Authorization::UPDATE,
+        edit: ActiveAdmin::Authorization::EDIT,
         update: ActiveAdmin::Authorization::UPDATE,
         destroy: ActiveAdmin::Authorization::DESTROY
       }

data/lib/active_admin/dependency.rb

@@ -56,10 +56,6 @@ module ActiveAdmin
       Matcher.new name.to_s
     end
 
-    def self.supports_zeitwerk?
-      RUBY_ENGINE != "jruby"
-    end
-
     class Matcher
       attr_reader :name
 

data/lib/active_admin/engine.rb

@@ -12,7 +12,7 @@ module ActiveAdmin
         ActiveAdmin.application.stylesheets.each do |path, _|
           app.config.assets.precompile << path
         end
-        ActiveAdmin.application.javascripts.each do |path|
+        ActiveAdmin.application.javascripts.each do |path, _|
           app.config.assets.precompile << path
         end
       end

data/lib/active_admin/filters/resource_extension.rb

@@ -3,8 +3,8 @@ module ActiveAdmin
   module Filters
 
     class Disabled < RuntimeError
-      def initialize
-        super "Can't remove a filter when filters are disabled. Enable filters with 'config.filters = true'"
+      def initialize(action)
+        super "Cannot #{action} a filter when filters are disabled. Enable filters with 'config.filters = true'"
       end
     end
 
@@ -61,7 +61,7 @@ module ActiveAdmin
       #
       # @param [Symbol] attributes The attributes to not filter on
       def remove_filter(*attributes)
-        raise Disabled unless filters_enabled?
+        raise Disabled, "remove" unless filters_enabled?
 
         attributes.each { |attribute| (@filters_to_remove ||= []) << attribute.to_sym }
       end
@@ -73,7 +73,7 @@ module ActiveAdmin
       # @param [Hash] options The set of options that are passed through to
       #                       ransack for the field definition.
       def add_filter(attribute, options = {})
-        raise Disabled unless filters_enabled?
+        raise Disabled, "add" unless filters_enabled?
 
         (@filters ||= {})[attribute.to_sym] = options
       end

data/lib/active_admin/namespace.rb

@@ -60,7 +60,7 @@ module ActiveAdmin
       settings.respond_to?(method) ? settings.send(method, *args) : super
     end
 
-    # Register a resource into this namespace. The preffered method to access this is to
+    # Register a resource into this namespace. The preferred method to access this is to
     # use the global registration ActiveAdmin.register which delegates to the proper
     # namespace instance.
     def register(resource_class, options = {}, &block)
@@ -72,7 +72,7 @@ module ActiveAdmin
       reset_menu!
 
       # Dispatch a registration event
-      ActiveSupport::Notifications.instrument ActiveAdmin::Resource::RegisterEvent, config
+      ActiveSupport::Notifications.instrument ActiveAdmin::Resource::RegisterEvent, { active_admin_resource: config }
 
       # Return the config
       config