From 21ff4c958867c52f86d1f211fbb8d0502d43251a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Pierzcha=C5=82a?= Date: Thu, 19 Sep 2024 03:16:59 +0200 Subject: [PATCH 1/5] Add polish translations for v4 keys (#8481) --- config/locales/pl.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 75d430c9bda..d11f8822edf 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -54,6 +54,10 @@ pl: "yes": "Tak" "no": "Nie" "unset": "Nie" + toggle_dark_mode: Przełącz tryb ciemny + toggle_main_navigation_menu: Przełącz główną nawigację + toggle_section: Przełącz sekcję + toggle_user_menu: Przełącz menu użytkownika logout: "Wyloguj" powered_by: "Powered by %{active_admin} %{version}" sidebars: From 50489c2c18d8e5d3e9c4b753840f7149559cffca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Ram=C3=ADrez?= Date: Fri, 20 Sep 2024 17:36:35 -0300 Subject: [PATCH 2/5] Add spanish translations for v4 keys (#8483) --- config/locales/es.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/locales/es.yml b/config/locales/es.yml index b379960cf75..c39ddb4c544 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -35,6 +35,10 @@ es: has_many_delete: "Eliminar" has_many_remove: "Quitar" move: "Mover" + toggle_dark_mode: "Alternar modo oscuro" + toggle_main_navigation_menu: "Alternar el menú de navegación principal" + toggle_user_menu: "Alternar menú de usuario" + toggle_section: "Alternar sección" filters: buttons: filter: "Filtrar" @@ -62,6 +66,8 @@ es: multiple: "Mostrando %{model} %{from} - %{to} de un total de %{total}" multiple_without_total: "Mostrando %{model} %{from} - %{to}" per_page: "Por página: " + previous: "Anterior" + next: "Siguiente" entry: one: "registro" other: "registros" From e6ecf5bbc1585f54d8a5997cba60d9eaede0a3a2 Mon Sep 17 00:00:00 2001 From: Geremia Taglialatela Date: Mon, 23 Sep 2024 13:57:34 +0200 Subject: [PATCH 3/5] Prefer `require_relative` for internal requires (#8482) `require_relative` is preferred over `require` for files within the same project because it uses paths relative to the current file, making code more portable and less dependent on the load path. This change updates internal requires to use `require_relative` for consistency, performance, and improved portability. Ref: - activeadmin/arbre#622 - activeadmin/inherited_resources#939 --- lib/active_admin.rb | 10 +++--- lib/active_admin/application.rb | 6 ++-- lib/active_admin/application_settings.rb | 2 +- lib/active_admin/batch_actions.rb | 8 ++--- .../batch_actions/views/batch_action_form.rb | 2 +- .../batch_actions/views/selection_cells.rb | 2 +- lib/active_admin/dynamic_settings_node.rb | 4 +-- lib/active_admin/engine.rb | 2 +- lib/active_admin/filters.rb | 10 +++--- lib/active_admin/filters/active.rb | 2 +- .../filters/resource_extension.rb | 2 +- lib/active_admin/localizers.rb | 2 +- lib/active_admin/menu_item.rb | 2 +- lib/active_admin/namespace.rb | 2 +- lib/active_admin/namespace_settings.rb | 2 +- lib/active_admin/orm/active_record.rb | 2 +- .../orm/active_record/comments.rb | 6 ++-- .../orm/active_record/comments/views.rb | 4 +-- .../comments/views/active_admin_comments.rb | 2 +- lib/active_admin/resource.rb | 32 +++++++++---------- lib/active_admin/resource/action_items.rb | 2 +- lib/active_admin/resource/belongs_to.rb | 2 +- lib/active_admin/resource/sidebars.rb | 2 +- lib/active_admin/views/components/scopes.rb | 4 +-- lib/activeadmin.rb | 2 +- .../active_admin/devise/devise_generator.rb | 4 +-- 26 files changed, 60 insertions(+), 60 deletions(-) diff --git a/lib/active_admin.rb b/lib/active_admin.rb index 4cbbab6f752..148f34468e2 100644 --- a/lib/active_admin.rb +++ b/lib/active_admin.rb @@ -125,12 +125,12 @@ def wrap_block_for_active_support_notifications block end # Require things that don't support autoload -require "active_admin/engine" -require "active_admin/error" +require_relative "active_admin/engine" +require_relative "active_admin/error" # Require internal plugins -require "active_admin/batch_actions" -require "active_admin/filters" +require_relative "active_admin/batch_actions" +require_relative "active_admin/filters" # Require ORM-specific plugins -require "active_admin/orm/active_record" if defined? ActiveRecord +require_relative "active_admin/orm/active_record" if defined? ActiveRecord diff --git a/lib/active_admin/application.rb b/lib/active_admin/application.rb index 6597e2d7756..a4b8dfe8125 100644 --- a/lib/active_admin/application.rb +++ b/lib/active_admin/application.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true -require "active_admin/router" -require "active_admin/application_settings" -require "active_admin/namespace_settings" +require_relative "router" +require_relative "application_settings" +require_relative "namespace_settings" module ActiveAdmin class Application diff --git a/lib/active_admin/application_settings.rb b/lib/active_admin/application_settings.rb index b6ad0ecdc6e..362705b21fd 100644 --- a/lib/active_admin/application_settings.rb +++ b/lib/active_admin/application_settings.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require "active_admin/settings_node" +require_relative "settings_node" module ActiveAdmin class ApplicationSettings < SettingsNode diff --git a/lib/active_admin/batch_actions.rb b/lib/active_admin/batch_actions.rb index f0da8746221..91a362da38b 100644 --- a/lib/active_admin/batch_actions.rb +++ b/lib/active_admin/batch_actions.rb @@ -1,12 +1,12 @@ # frozen_string_literal: true ActiveAdmin.before_load do |app| - require "active_admin/batch_actions/resource_extension" - require "active_admin/batch_actions/controller" + require_relative "batch_actions/resource_extension" + require_relative "batch_actions/controller" # Add our Extensions ActiveAdmin::Resource.send :include, ActiveAdmin::BatchActions::ResourceExtension ActiveAdmin::ResourceController.send :include, ActiveAdmin::BatchActions::Controller - require "active_admin/batch_actions/views/batch_action_form" - require "active_admin/batch_actions/views/selection_cells" + require_relative "batch_actions/views/batch_action_form" + require_relative "batch_actions/views/selection_cells" end diff --git a/lib/active_admin/batch_actions/views/batch_action_form.rb b/lib/active_admin/batch_actions/views/batch_action_form.rb index 7790e74bd36..6dbf41f131b 100644 --- a/lib/active_admin/batch_actions/views/batch_action_form.rb +++ b/lib/active_admin/batch_actions/views/batch_action_form.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require "active_admin/component" +require_relative "../../component" module ActiveAdmin module BatchActions diff --git a/lib/active_admin/batch_actions/views/selection_cells.rb b/lib/active_admin/batch_actions/views/selection_cells.rb index e118b0578c9..57d1afeb4cd 100644 --- a/lib/active_admin/batch_actions/views/selection_cells.rb +++ b/lib/active_admin/batch_actions/views/selection_cells.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require "active_admin/component" +require_relative "../../component" module ActiveAdmin module BatchActions diff --git a/lib/active_admin/dynamic_settings_node.rb b/lib/active_admin/dynamic_settings_node.rb index e7f9c0ae9d1..9227ea2db9e 100644 --- a/lib/active_admin/dynamic_settings_node.rb +++ b/lib/active_admin/dynamic_settings_node.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require "active_admin/dynamic_setting" -require "active_admin/settings_node" +require_relative "dynamic_setting" +require_relative "settings_node" module ActiveAdmin diff --git a/lib/active_admin/engine.rb b/lib/active_admin/engine.rb index 0eecded3d2c..0d1930bc2bc 100644 --- a/lib/active_admin/engine.rb +++ b/lib/active_admin/engine.rb @@ -35,7 +35,7 @@ class Engine < ::Rails::Engine end initializer "active_admin.routes" do - require "active_admin/helpers/routes/url_helpers" + require_relative "helpers/routes/url_helpers" end initializer "active_admin.deprecator" do |app| diff --git a/lib/active_admin/filters.rb b/lib/active_admin/filters.rb index 79abde58216..c69094f5d99 100644 --- a/lib/active_admin/filters.rb +++ b/lib/active_admin/filters.rb @@ -1,9 +1,9 @@ # frozen_string_literal: true -require "active_admin/filters/dsl" -require "active_admin/filters/resource_extension" -require "active_admin/filters/formtastic_addons" -require "active_admin/filters/forms" -require "active_admin/helpers/optional_display" +require_relative "filters/dsl" +require_relative "filters/resource_extension" +require_relative "filters/formtastic_addons" +require_relative "filters/forms" +require_relative "helpers/optional_display" # Add our Extensions ActiveAdmin::ResourceDSL.send :include, ActiveAdmin::Filters::DSL diff --git a/lib/active_admin/filters/active.rb b/lib/active_admin/filters/active.rb index 0d894c7d65e..b3879b53db1 100644 --- a/lib/active_admin/filters/active.rb +++ b/lib/active_admin/filters/active.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require "active_admin/filters/active_filter" +require_relative "active_filter" module ActiveAdmin module Filters diff --git a/lib/active_admin/filters/resource_extension.rb b/lib/active_admin/filters/resource_extension.rb index 78a69d07e78..70f564b3e46 100644 --- a/lib/active_admin/filters/resource_extension.rb +++ b/lib/active_admin/filters/resource_extension.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require "active_admin/filters/active" +require_relative "active" module ActiveAdmin module Filters diff --git a/lib/active_admin/localizers.rb b/lib/active_admin/localizers.rb index 9d5f8a44fd7..a0a8f1f4b12 100644 --- a/lib/active_admin/localizers.rb +++ b/lib/active_admin/localizers.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require "active_admin/localizers/resource_localizer" +require_relative "localizers/resource_localizer" module ActiveAdmin module Localizers diff --git a/lib/active_admin/menu_item.rb b/lib/active_admin/menu_item.rb index b4949896da8..e9b3f707671 100644 --- a/lib/active_admin/menu_item.rb +++ b/lib/active_admin/menu_item.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require 'active_admin/view_helpers/method_or_proc_helper' +require_relative "view_helpers/method_or_proc_helper" module ActiveAdmin class MenuItem diff --git a/lib/active_admin/namespace.rb b/lib/active_admin/namespace.rb index 09f14915cb7..7c28032123a 100644 --- a/lib/active_admin/namespace.rb +++ b/lib/active_admin/namespace.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require "active_admin/resource_collection" +require_relative "resource_collection" module ActiveAdmin diff --git a/lib/active_admin/namespace_settings.rb b/lib/active_admin/namespace_settings.rb index 449ef59ad0d..83f2ea9e98c 100644 --- a/lib/active_admin/namespace_settings.rb +++ b/lib/active_admin/namespace_settings.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require "active_admin/dynamic_settings_node" +require_relative "dynamic_settings_node" module ActiveAdmin class NamespaceSettings < DynamicSettingsNode diff --git a/lib/active_admin/orm/active_record.rb b/lib/active_admin/orm/active_record.rb index 37c166cd197..7fa22c66cc7 100644 --- a/lib/active_admin/orm/active_record.rb +++ b/lib/active_admin/orm/active_record.rb @@ -3,4 +3,4 @@ ActiveAdmin::DatabaseHitDuringLoad.database_error_classes << ActiveRecord::StatementInvalid -require "active_admin/orm/active_record/comments" +require_relative "active_record/comments" diff --git a/lib/active_admin/orm/active_record/comments.rb b/lib/active_admin/orm/active_record/comments.rb index 0092e4eddcf..5f0cc82e1df 100644 --- a/lib/active_admin/orm/active_record/comments.rb +++ b/lib/active_admin/orm/active_record/comments.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true -require "active_admin/orm/active_record/comments/views" -require "active_admin/orm/active_record/comments/namespace_helper" -require "active_admin/orm/active_record/comments/resource_helper" +require_relative "comments/views" +require_relative "comments/namespace_helper" +require_relative "comments/resource_helper" # Add the comments configuration ActiveAdmin::Application.inheritable_setting :comments, true diff --git a/lib/active_admin/orm/active_record/comments/views.rb b/lib/active_admin/orm/active_record/comments/views.rb index 94daaf79973..f844704792b 100644 --- a/lib/active_admin/orm/active_record/comments/views.rb +++ b/lib/active_admin/orm/active_record/comments/views.rb @@ -1,3 +1,3 @@ # frozen_string_literal: true -require "active_admin/views" -require "active_admin/orm/active_record/comments/views/active_admin_comments" +require_relative "../../../views" +require_relative "views/active_admin_comments" diff --git a/lib/active_admin/orm/active_record/comments/views/active_admin_comments.rb b/lib/active_admin/orm/active_record/comments/views/active_admin_comments.rb index 47c056a94a7..fdaa962f55a 100644 --- a/lib/active_admin/orm/active_record/comments/views/active_admin_comments.rb +++ b/lib/active_admin/orm/active_record/comments/views/active_admin_comments.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require "active_admin/views" +require_relative "../../../../views" module ActiveAdmin module Comments diff --git a/lib/active_admin/resource.rb b/lib/active_admin/resource.rb index 2ccda9d1d1f..7ef4ed4ec5c 100644 --- a/lib/active_admin/resource.rb +++ b/lib/active_admin/resource.rb @@ -1,20 +1,20 @@ # frozen_string_literal: true -require "active_admin/view_helpers/method_or_proc_helper" -require "active_admin/resource/action_items" -require "active_admin/resource/attributes" -require "active_admin/resource/controllers" -require "active_admin/resource/menu" -require "active_admin/resource/page_presenters" -require "active_admin/resource/pagination" -require "active_admin/resource/routes" -require "active_admin/resource/naming" -require "active_admin/resource/scopes" -require "active_admin/resource/includes" -require "active_admin/resource/scope_to" -require "active_admin/resource/sidebars" -require "active_admin/resource/belongs_to" -require "active_admin/resource/ordering" -require "active_admin/resource/model" +require_relative "view_helpers/method_or_proc_helper" +require_relative "resource/action_items" +require_relative "resource/attributes" +require_relative "resource/controllers" +require_relative "resource/menu" +require_relative "resource/page_presenters" +require_relative "resource/pagination" +require_relative "resource/routes" +require_relative "resource/naming" +require_relative "resource/scopes" +require_relative "resource/includes" +require_relative "resource/scope_to" +require_relative "resource/sidebars" +require_relative "resource/belongs_to" +require_relative "resource/ordering" +require_relative "resource/model" module ActiveAdmin diff --git a/lib/active_admin/resource/action_items.rb b/lib/active_admin/resource/action_items.rb index a59e0bd663f..308af2f4457 100644 --- a/lib/active_admin/resource/action_items.rb +++ b/lib/active_admin/resource/action_items.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require "active_admin/helpers/optional_display" +require_relative "../helpers/optional_display" module ActiveAdmin diff --git a/lib/active_admin/resource/belongs_to.rb b/lib/active_admin/resource/belongs_to.rb index 45d771c763f..4292b0fe4c6 100644 --- a/lib/active_admin/resource/belongs_to.rb +++ b/lib/active_admin/resource/belongs_to.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require "active_admin/resource" +require_relative "../resource" module ActiveAdmin class Resource diff --git a/lib/active_admin/resource/sidebars.rb b/lib/active_admin/resource/sidebars.rb index 53352320500..7d73d44456b 100644 --- a/lib/active_admin/resource/sidebars.rb +++ b/lib/active_admin/resource/sidebars.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require "active_admin/helpers/optional_display" +require_relative "../helpers/optional_display" module ActiveAdmin diff --git a/lib/active_admin/views/components/scopes.rb b/lib/active_admin/views/components/scopes.rb index 99610e42ee3..c7f89ced7b5 100644 --- a/lib/active_admin/views/components/scopes.rb +++ b/lib/active_admin/views/components/scopes.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require "active_admin/async_count" -require "active_admin/view_helpers/method_or_proc_helper" +require_relative "../../async_count" +require_relative "../../view_helpers/method_or_proc_helper" module ActiveAdmin module Views diff --git a/lib/activeadmin.rb b/lib/activeadmin.rb index 90e42f4981f..9ebd064ec35 100644 --- a/lib/activeadmin.rb +++ b/lib/activeadmin.rb @@ -1,2 +1,2 @@ # frozen_string_literal: true -require "active_admin" +require_relative "active_admin" diff --git a/lib/generators/active_admin/devise/devise_generator.rb b/lib/generators/active_admin/devise/devise_generator.rb index 544902eb2a0..2e764a6d6e2 100644 --- a/lib/generators/active_admin/devise/devise_generator.rb +++ b/lib/generators/active_admin/devise/devise_generator.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require "active_admin/error" -require "active_admin/dependency" +require_relative "../../../active_admin/error" +require_relative "../../../active_admin/dependency" module ActiveAdmin module Generators From 28cdc19e8cb369d1d21a54b5d4c494b79b1aa6ed Mon Sep 17 00:00:00 2001 From: Geremia Taglialatela Date: Mon, 23 Sep 2024 16:35:57 +0200 Subject: [PATCH 4/5] Update changelog and version (#8484) --- Gemfile.lock | 16 ++++++++-------- docs/Gemfile.lock | 8 +++++--- gemfiles/rails_61/Gemfile.lock | 12 ++++++------ gemfiles/rails_70/Gemfile.lock | 12 ++++++------ gemfiles/rails_71/Gemfile.lock | 12 ++++++------ lib/active_admin/version.rb | 2 +- package.json | 2 +- 7 files changed, 33 insertions(+), 31 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e1dc87a506c..bf6628660dc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - activeadmin (4.0.0.beta12) + activeadmin (4.0.0.beta13) arbre (~> 2.0) csv formtastic (>= 3.1) @@ -63,9 +63,9 @@ GEM globalid (>= 0.3.6) activemodel (7.2.1) activesupport (= 7.2.1) - activemodel-serializers-xml (1.0.2) - activemodel (> 5.x) - activesupport (> 5.x) + activemodel-serializers-xml (1.0.3) + activemodel (>= 5.0.0.a) + activesupport (>= 5.0.0.a) builder (~> 3.1) activerecord (7.2.1) activemodel (= 7.2.1) @@ -188,7 +188,7 @@ GEM activesupport (>= 5.2) highline (3.1.1) reline - i18n (1.14.5) + i18n (1.14.6) concurrent-ruby (~> 1.0) i18n-spec (0.6.0) iso @@ -371,10 +371,10 @@ GEM rubocop (~> 1.41) rubocop-packaging (0.5.2) rubocop (>= 1.33, < 2.0) - rubocop-performance (1.21.1) + rubocop-performance (1.22.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails (2.26.1) + rubocop-rails (2.26.2) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.52.0, < 2.0) @@ -470,4 +470,4 @@ DEPENDENCIES yard BUNDLED WITH - 2.5.18 + 2.5.19 diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock index 8cdc3c09bbc..b470870d28b 100644 --- a/docs/Gemfile.lock +++ b/docs/Gemfile.lock @@ -35,8 +35,9 @@ GEM ffi (>= 1.15.0) eventmachine (1.2.7) execjs (2.9.1) - faraday (2.11.0) + faraday (2.12.0) faraday-net_http (>= 2.0, < 3.4) + json logger faraday-net_http (3.3.0) net-http @@ -99,7 +100,7 @@ GEM activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.8.0) - i18n (1.14.5) + i18n (1.14.6) concurrent-ruby (~> 1.0) jekyll (3.10.0) addressable (~> 2.4) @@ -211,6 +212,7 @@ GEM gemoji (>= 3, < 5) html-pipeline (~> 2.2) jekyll (>= 3.0, < 5.0) + json (2.7.2) kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) @@ -273,4 +275,4 @@ DEPENDENCIES github-pages BUNDLED WITH - 2.5.18 + 2.5.19 diff --git a/gemfiles/rails_61/Gemfile.lock b/gemfiles/rails_61/Gemfile.lock index 25a639e1503..9231511f2b9 100644 --- a/gemfiles/rails_61/Gemfile.lock +++ b/gemfiles/rails_61/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: ../.. specs: - activeadmin (4.0.0.beta12) + activeadmin (4.0.0.beta13) arbre (~> 2.0) csv formtastic (>= 3.1) @@ -57,9 +57,9 @@ GEM globalid (>= 0.3.6) activemodel (6.1.7.8) activesupport (= 6.1.7.8) - activemodel-serializers-xml (1.0.2) - activemodel (> 5.x) - activesupport (> 5.x) + activemodel-serializers-xml (1.0.3) + activemodel (>= 5.0.0.a) + activesupport (>= 5.0.0.a) builder (~> 3.1) activerecord (6.1.7.8) activemodel (= 6.1.7.8) @@ -173,7 +173,7 @@ GEM activesupport (>= 5.2) highline (3.1.1) reline - i18n (1.14.5) + i18n (1.14.6) concurrent-ruby (~> 1.0) i18n-spec (0.6.0) iso @@ -399,4 +399,4 @@ DEPENDENCIES webrick BUNDLED WITH - 2.5.18 + 2.5.19 diff --git a/gemfiles/rails_70/Gemfile.lock b/gemfiles/rails_70/Gemfile.lock index f30af2dd747..dffff94eac2 100644 --- a/gemfiles/rails_70/Gemfile.lock +++ b/gemfiles/rails_70/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: ../.. specs: - activeadmin (4.0.0.beta12) + activeadmin (4.0.0.beta13) arbre (~> 2.0) csv formtastic (>= 3.1) @@ -64,9 +64,9 @@ GEM globalid (>= 0.3.6) activemodel (7.0.8.4) activesupport (= 7.0.8.4) - activemodel-serializers-xml (1.0.2) - activemodel (> 5.x) - activesupport (> 5.x) + activemodel-serializers-xml (1.0.3) + activemodel (>= 5.0.0.a) + activesupport (>= 5.0.0.a) builder (~> 3.1) activerecord (7.0.8.4) activemodel (= 7.0.8.4) @@ -179,7 +179,7 @@ GEM activesupport (>= 5.2) highline (3.1.1) reline - i18n (1.14.5) + i18n (1.14.6) concurrent-ruby (~> 1.0) i18n-spec (0.6.0) iso @@ -403,4 +403,4 @@ DEPENDENCIES webrick BUNDLED WITH - 2.5.18 + 2.5.19 diff --git a/gemfiles/rails_71/Gemfile.lock b/gemfiles/rails_71/Gemfile.lock index 7f4c0c33160..0a976a0ad97 100644 --- a/gemfiles/rails_71/Gemfile.lock +++ b/gemfiles/rails_71/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: ../.. specs: - activeadmin (4.0.0.beta12) + activeadmin (4.0.0.beta13) arbre (~> 2.0) csv formtastic (>= 3.1) @@ -68,9 +68,9 @@ GEM globalid (>= 0.3.6) activemodel (7.1.4) activesupport (= 7.1.4) - activemodel-serializers-xml (1.0.2) - activemodel (> 5.x) - activesupport (> 5.x) + activemodel-serializers-xml (1.0.3) + activemodel (>= 5.0.0.a) + activesupport (>= 5.0.0.a) builder (~> 3.1) activerecord (7.1.4) activemodel (= 7.1.4) @@ -191,7 +191,7 @@ GEM activesupport (>= 5.2) highline (3.1.1) reline - i18n (1.14.5) + i18n (1.14.6) concurrent-ruby (~> 1.0) i18n-spec (0.6.0) iso @@ -431,4 +431,4 @@ DEPENDENCIES webrick BUNDLED WITH - 2.5.18 + 2.5.19 diff --git a/lib/active_admin/version.rb b/lib/active_admin/version.rb index bb966fa6fab..c0198385828 100644 --- a/lib/active_admin/version.rb +++ b/lib/active_admin/version.rb @@ -1,4 +1,4 @@ # frozen_string_literal: true module ActiveAdmin - VERSION = "4.0.0.beta12" + VERSION = "4.0.0.beta13" end diff --git a/package.json b/package.json index fb4771eff41..c1b5d5b7e08 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@activeadmin/activeadmin", - "version": "4.0.0-beta12", + "version": "4.0.0-beta13", "description": "The administration framework for Ruby on Rails.", "main": "dist/active_admin.js", "type": "module", From 1ae99edfcc88b0b3396cdcb0e4ef4d0d29868afd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Sep 2024 09:05:47 +0200 Subject: [PATCH 5/5] Bump rollup from 4.21.2 to 4.22.4 (#8486) Bumps [rollup](https://github.com/rollup/rollup) from 4.21.2 to 4.22.4. - [Release notes](https://github.com/rollup/rollup/releases) - [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md) - [Commits](https://github.com/rollup/rollup/compare/v4.21.2...v4.22.4) --- updated-dependencies: - dependency-name: rollup dependency-type: direct:development ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 196 +++++++++++++++++++++++++++--------------------------- 1 file changed, 98 insertions(+), 98 deletions(-) diff --git a/yarn.lock b/yarn.lock index 33228ed8dcb..15f6fc49a98 100644 --- a/yarn.lock +++ b/yarn.lock @@ -203,85 +203,85 @@ dependencies: slash "^4.0.0" -"@rollup/rollup-android-arm-eabi@4.21.2": - version "4.21.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.2.tgz#0412834dc423d1ff7be4cb1fc13a86a0cd262c11" - integrity sha512-fSuPrt0ZO8uXeS+xP3b+yYTCBUd05MoSp2N/MFOgjhhUhMmchXlpTQrTpI8T+YAwAQuK7MafsCOxW7VrPMrJcg== - -"@rollup/rollup-android-arm64@4.21.2": - version "4.21.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.2.tgz#baf1a014b13654f3b9e835388df9caf8c35389cb" - integrity sha512-xGU5ZQmPlsjQS6tzTTGwMsnKUtu0WVbl0hYpTPauvbRAnmIvpInhJtgjj3mcuJpEiuUw4v1s4BimkdfDWlh7gA== - -"@rollup/rollup-darwin-arm64@4.21.2": - version "4.21.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.2.tgz#0a2c364e775acdf1172fe3327662eec7c46e55b1" - integrity sha512-99AhQ3/ZMxU7jw34Sq8brzXqWH/bMnf7ZVhvLk9QU2cOepbQSVTns6qoErJmSiAvU3InRqC2RRZ5ovh1KN0d0Q== - -"@rollup/rollup-darwin-x64@4.21.2": - version "4.21.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.2.tgz#a972db75890dfab8df0da228c28993220a468c42" - integrity sha512-ZbRaUvw2iN/y37x6dY50D8m2BnDbBjlnMPotDi/qITMJ4sIxNY33HArjikDyakhSv0+ybdUxhWxE6kTI4oX26w== - -"@rollup/rollup-linux-arm-gnueabihf@4.21.2": - version "4.21.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.2.tgz#1609d0630ef61109dd19a278353e5176d92e30a1" - integrity sha512-ztRJJMiE8nnU1YFcdbd9BcH6bGWG1z+jP+IPW2oDUAPxPjo9dverIOyXz76m6IPA6udEL12reYeLojzW2cYL7w== - -"@rollup/rollup-linux-arm-musleabihf@4.21.2": - version "4.21.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.2.tgz#3c1dca5f160aa2e79e4b20ff6395eab21804f266" - integrity sha512-flOcGHDZajGKYpLV0JNc0VFH361M7rnV1ee+NTeC/BQQ1/0pllYcFmxpagltANYt8FYf9+kL6RSk80Ziwyhr7w== - -"@rollup/rollup-linux-arm64-gnu@4.21.2": - version "4.21.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.2.tgz#c2fe376e8b04eafb52a286668a8df7c761470ac7" - integrity sha512-69CF19Kp3TdMopyteO/LJbWufOzqqXzkrv4L2sP8kfMaAQ6iwky7NoXTp7bD6/irKgknDKM0P9E/1l5XxVQAhw== - -"@rollup/rollup-linux-arm64-musl@4.21.2": - version "4.21.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.2.tgz#e62a4235f01e0f66dbba587c087ca6db8008ec80" - integrity sha512-48pD/fJkTiHAZTnZwR0VzHrao70/4MlzJrq0ZsILjLW/Ab/1XlVUStYyGt7tdyIiVSlGZbnliqmult/QGA2O2w== - -"@rollup/rollup-linux-powerpc64le-gnu@4.21.2": - version "4.21.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.2.tgz#24b3457e75ee9ae5b1c198bd39eea53222a74e54" - integrity sha512-cZdyuInj0ofc7mAQpKcPR2a2iu4YM4FQfuUzCVA2u4HI95lCwzjoPtdWjdpDKyHxI0UO82bLDoOaLfpZ/wviyQ== - -"@rollup/rollup-linux-riscv64-gnu@4.21.2": - version "4.21.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.2.tgz#38edfba9620fe2ca8116c97e02bd9f2d606bde09" - integrity sha512-RL56JMT6NwQ0lXIQmMIWr1SW28z4E4pOhRRNqwWZeXpRlykRIlEpSWdsgNWJbYBEWD84eocjSGDu/XxbYeCmwg== - -"@rollup/rollup-linux-s390x-gnu@4.21.2": - version "4.21.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.2.tgz#a3bfb8bc5f1e802f8c76cff4a4be2e9f9ac36a18" - integrity sha512-PMxkrWS9z38bCr3rWvDFVGD6sFeZJw4iQlhrup7ReGmfn7Oukrr/zweLhYX6v2/8J6Cep9IEA/SmjXjCmSbrMQ== - -"@rollup/rollup-linux-x64-gnu@4.21.2": - version "4.21.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.2.tgz#0dadf34be9199fcdda44b5985a086326344f30ad" - integrity sha512-B90tYAUoLhU22olrafY3JQCFLnT3NglazdwkHyxNDYF/zAxJt5fJUB/yBoWFoIQ7SQj+KLe3iL4BhOMa9fzgpw== - -"@rollup/rollup-linux-x64-musl@4.21.2": - version "4.21.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.2.tgz#7b7deddce240400eb87f2406a445061b4fed99a8" - integrity sha512-7twFizNXudESmC9oneLGIUmoHiiLppz/Xs5uJQ4ShvE6234K0VB1/aJYU3f/4g7PhssLGKBVCC37uRkkOi8wjg== - -"@rollup/rollup-win32-arm64-msvc@4.21.2": - version "4.21.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.2.tgz#a0ca0c5149c2cfb26fab32e6ba3f16996fbdb504" - integrity sha512-9rRero0E7qTeYf6+rFh3AErTNU1VCQg2mn7CQcI44vNUWM9Ze7MSRS/9RFuSsox+vstRt97+x3sOhEey024FRQ== - -"@rollup/rollup-win32-ia32-msvc@4.21.2": - version "4.21.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.2.tgz#aae2886beec3024203dbb5569db3a137bc385f8e" - integrity sha512-5rA4vjlqgrpbFVVHX3qkrCo/fZTj1q0Xxpg+Z7yIo3J2AilW7t2+n6Q8Jrx+4MrYpAnjttTYF8rr7bP46BPzRw== - -"@rollup/rollup-win32-x64-msvc@4.21.2": - version "4.21.2" - resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.2.tgz#e4291e3c1bc637083f87936c333cdbcad22af63b" - integrity sha512-6UUxd0+SKomjdzuAcp+HAmxw1FlGBnl1v2yEPSabtx4lBfdXHDVsW7+lQkgz9cNFJGY3AWR7+V8P5BqkD9L9nA== +"@rollup/rollup-android-arm-eabi@4.22.4": + version "4.22.4" + resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.4.tgz#8b613b9725e8f9479d142970b106b6ae878610d5" + integrity sha512-Fxamp4aEZnfPOcGA8KSNEohV8hX7zVHOemC8jVBoBUHu5zpJK/Eu3uJwt6BMgy9fkvzxDaurgj96F/NiLukF2w== + +"@rollup/rollup-android-arm64@4.22.4": + version "4.22.4" + resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.4.tgz#654ca1049189132ff602bfcf8df14c18da1f15fb" + integrity sha512-VXoK5UMrgECLYaMuGuVTOx5kcuap1Jm8g/M83RnCHBKOqvPPmROFJGQaZhGccnsFtfXQ3XYa4/jMCJvZnbJBdA== + +"@rollup/rollup-darwin-arm64@4.22.4": + version "4.22.4" + resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.4.tgz#6d241d099d1518ef0c2205d96b3fa52e0fe1954b" + integrity sha512-xMM9ORBqu81jyMKCDP+SZDhnX2QEVQzTcC6G18KlTQEzWK8r/oNZtKuZaCcHhnsa6fEeOBionoyl5JsAbE/36Q== + +"@rollup/rollup-darwin-x64@4.22.4": + version "4.22.4" + resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.4.tgz#42bd19d292a57ee11734c980c4650de26b457791" + integrity sha512-aJJyYKQwbHuhTUrjWjxEvGnNNBCnmpHDvrb8JFDbeSH3m2XdHcxDd3jthAzvmoI8w/kSjd2y0udT+4okADsZIw== + +"@rollup/rollup-linux-arm-gnueabihf@4.22.4": + version "4.22.4" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.4.tgz#f23555ee3d8fe941c5c5fd458cd22b65eb1c2232" + integrity sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ== + +"@rollup/rollup-linux-arm-musleabihf@4.22.4": + version "4.22.4" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.4.tgz#f3bbd1ae2420f5539d40ac1fde2b38da67779baa" + integrity sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg== + +"@rollup/rollup-linux-arm64-gnu@4.22.4": + version "4.22.4" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.4.tgz#7abe900120113e08a1f90afb84c7c28774054d15" + integrity sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw== + +"@rollup/rollup-linux-arm64-musl@4.22.4": + version "4.22.4" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.4.tgz#9e655285c8175cd44f57d6a1e8e5dedfbba1d820" + integrity sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA== + +"@rollup/rollup-linux-powerpc64le-gnu@4.22.4": + version "4.22.4" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.4.tgz#9a79ae6c9e9d8fe83d49e2712ecf4302db5bef5e" + integrity sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg== + +"@rollup/rollup-linux-riscv64-gnu@4.22.4": + version "4.22.4" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.4.tgz#67ac70eca4ace8e2942fabca95164e8874ab8128" + integrity sha512-ePYIir6VYnhgv2C5Xe9u+ico4t8sZWXschR6fMgoPUK31yQu7hTEJb7bCqivHECwIClJfKgE7zYsh1qTP3WHUA== + +"@rollup/rollup-linux-s390x-gnu@4.22.4": + version "4.22.4" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.4.tgz#9f883a7440f51a22ed7f99e1d070bd84ea5005fc" + integrity sha512-GqFJ9wLlbB9daxhVlrTe61vJtEY99/xB3C8e4ULVsVfflcpmR6c8UZXjtkMA6FhNONhj2eA5Tk9uAVw5orEs4Q== + +"@rollup/rollup-linux-x64-gnu@4.22.4": + version "4.22.4" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.4.tgz#70116ae6c577fe367f58559e2cffb5641a1dd9d0" + integrity sha512-87v0ol2sH9GE3cLQLNEy0K/R0pz1nvg76o8M5nhMR0+Q+BBGLnb35P0fVz4CQxHYXaAOhE8HhlkaZfsdUOlHwg== + +"@rollup/rollup-linux-x64-musl@4.22.4": + version "4.22.4" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.4.tgz#f473f88219feb07b0b98b53a7923be716d1d182f" + integrity sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g== + +"@rollup/rollup-win32-arm64-msvc@4.22.4": + version "4.22.4" + resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.4.tgz#4349482d17f5d1c58604d1c8900540d676f420e0" + integrity sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw== + +"@rollup/rollup-win32-ia32-msvc@4.22.4": + version "4.22.4" + resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.4.tgz#a6fc39a15db618040ec3c2a24c1e26cb5f4d7422" + integrity sha512-SiWG/1TuUdPvYmzmYnmd3IEifzR61Tragkbx9D3+R8mzQqDBz8v+BvZNDlkiTtI9T15KYZhP0ehn3Dld4n9J5g== + +"@rollup/rollup-win32-x64-msvc@4.22.4": + version "4.22.4" + resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.4.tgz#3dd5d53e900df2a40841882c02e56f866c04d202" + integrity sha512-j8pPKp53/lq9lMXN57S8cFz0MynJk8OWNuUnXct/9KCpKU7DgU3bYMJhwWmcqC0UU29p8Lr0/7KEVcaM6bf47Q== "@types/estree@1.0.5": version "1.0.5" @@ -1258,28 +1258,28 @@ reusify@^1.0.4: integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== rollup@^4.19.2: - version "4.21.2" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.21.2.tgz#f41f277a448d6264e923dd1ea179f0a926aaf9b7" - integrity sha512-e3TapAgYf9xjdLvKQCkQTnbTKd4a6jwlpQSJJFokHGaX2IVjoEqkIIhiQfqsi0cdwlOD+tQGuOd5AJkc5RngBw== + version "4.22.4" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.22.4.tgz#4135a6446671cd2a2453e1ad42a45d5973ec3a0f" + integrity sha512-vD8HJ5raRcWOyymsR6Z3o6+RzfEPCnVLMFJ6vRslO1jt4LO6dUo5Qnpg7y4RkZFM2DMe3WUirkI5c16onjrc6A== dependencies: "@types/estree" "1.0.5" optionalDependencies: - "@rollup/rollup-android-arm-eabi" "4.21.2" - "@rollup/rollup-android-arm64" "4.21.2" - "@rollup/rollup-darwin-arm64" "4.21.2" - "@rollup/rollup-darwin-x64" "4.21.2" - "@rollup/rollup-linux-arm-gnueabihf" "4.21.2" - "@rollup/rollup-linux-arm-musleabihf" "4.21.2" - "@rollup/rollup-linux-arm64-gnu" "4.21.2" - "@rollup/rollup-linux-arm64-musl" "4.21.2" - "@rollup/rollup-linux-powerpc64le-gnu" "4.21.2" - "@rollup/rollup-linux-riscv64-gnu" "4.21.2" - "@rollup/rollup-linux-s390x-gnu" "4.21.2" - "@rollup/rollup-linux-x64-gnu" "4.21.2" - "@rollup/rollup-linux-x64-musl" "4.21.2" - "@rollup/rollup-win32-arm64-msvc" "4.21.2" - "@rollup/rollup-win32-ia32-msvc" "4.21.2" - "@rollup/rollup-win32-x64-msvc" "4.21.2" + "@rollup/rollup-android-arm-eabi" "4.22.4" + "@rollup/rollup-android-arm64" "4.22.4" + "@rollup/rollup-darwin-arm64" "4.22.4" + "@rollup/rollup-darwin-x64" "4.22.4" + "@rollup/rollup-linux-arm-gnueabihf" "4.22.4" + "@rollup/rollup-linux-arm-musleabihf" "4.22.4" + "@rollup/rollup-linux-arm64-gnu" "4.22.4" + "@rollup/rollup-linux-arm64-musl" "4.22.4" + "@rollup/rollup-linux-powerpc64le-gnu" "4.22.4" + "@rollup/rollup-linux-riscv64-gnu" "4.22.4" + "@rollup/rollup-linux-s390x-gnu" "4.22.4" + "@rollup/rollup-linux-x64-gnu" "4.22.4" + "@rollup/rollup-linux-x64-musl" "4.22.4" + "@rollup/rollup-win32-arm64-msvc" "4.22.4" + "@rollup/rollup-win32-ia32-msvc" "4.22.4" + "@rollup/rollup-win32-x64-msvc" "4.22.4" fsevents "~2.3.2" run-parallel@^1.1.9: