diff --git a/.ruby-version b/.ruby-version index fcdb2e10..1454f6ed 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -4.0.0 +4.0.1 diff --git a/Gemfile b/Gemfile index 34e53cba..09bb1cc3 100644 --- a/Gemfile +++ b/Gemfile @@ -12,8 +12,8 @@ gem "sprockets-rails" gem "cssbundling-rails", "1.4.2" # TODO: relax this dependency when rails/cssbundling-rails#169 will be fixed gem "importmap-rails" -gem "activeadmin", "4.0.0.beta19" # github: "activeadmin/activeadmin", branch: "master" -gem "devise" +gem "activeadmin", "4.0.0.beta20" # github: "activeadmin/activeadmin", branch: "master" +gem "devise", "~> 4.9" # TODO: relax this dependency when formtastic/formtastic#1401 will be fixed # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem "tzinfo-data", platforms: %i[ windows jruby ] diff --git a/Gemfile.lock b/Gemfile.lock index 8b5141da..7ceb1835 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -47,14 +47,14 @@ GEM erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activeadmin (4.0.0.beta19) + activeadmin (4.0.0.beta20) arbre (~> 2.0) csv formtastic (>= 5.0) formtastic_i18n (>= 0.7) inherited_resources (~> 2.0) kaminari (>= 1.2.1) - railties (>= 7.0) + railties (>= 7.2) ransack (>= 4.0) activejob (8.1.2) activesupport (= 8.1.2) @@ -195,12 +195,12 @@ GEM pp (0.6.3) prettyprint prettyprint (0.2.0) - prism (1.7.0) + prism (1.9.0) psych (5.3.1) date stringio public_suffix (7.0.2) - puma (7.1.0) + puma (7.2.0) nio4r (~> 2.0) racc (1.8.1) rack (3.2.4) @@ -246,7 +246,7 @@ GEM activerecord (>= 7.2) activesupport (>= 7.2) i18n - rdoc (7.0.3) + rdoc (7.1.0) erb psych (>= 4.0.0) tsort @@ -259,7 +259,7 @@ GEM rexml (3.4.4) rubyzip (3.2.2) securerandom (0.4.1) - selenium-webdriver (4.39.0) + selenium-webdriver (4.40.0) base64 (~> 0.2) logger (~> 1.4) rexml (~> 3.2, >= 3.2.5) @@ -312,11 +312,11 @@ PLATFORMS x86_64-linux DEPENDENCIES - activeadmin (= 4.0.0.beta19) + activeadmin (= 4.0.0.beta20) capybara cssbundling-rails (= 1.4.2) debug - devise + devise (~> 4.9) importmap-rails puma rails (~> 8.1.2) @@ -328,7 +328,7 @@ DEPENDENCIES tzinfo-data RUBY VERSION - ruby 4.0.0 + ruby 4.0.1 BUNDLED WITH - 4.0.3 + 4.0.5 diff --git a/package.json b/package.json index 9322d915..f9afb48c 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "private": "true", "type": "module", "dependencies": { - "@activeadmin/activeadmin": "4.0.0-beta19", + "@activeadmin/activeadmin": "4.0.0-beta20", "tailwindcss": "^4.1.18" }, "scripts": { diff --git a/yarn.lock b/yarn.lock index 308af7b5..401aa9ea 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@activeadmin/activeadmin@4.0.0-beta19": - version "4.0.0-beta19" - resolved "https://registry.yarnpkg.com/@activeadmin/activeadmin/-/activeadmin-4.0.0-beta19.tgz#fcc7e43de40bb0d1ba5ee1ef6eed0c2580a3d87f" - integrity sha512-U/5yHRqlY21etaWK6zsN0O0Flwp/hoajbG1kt2OoiMl+yo3GlV10AM50j6cJioRCP7L0L3wtyAjO+aVJUWCbDg== +"@activeadmin/activeadmin@4.0.0-beta20": + version "4.0.0-beta20" + resolved "https://registry.yarnpkg.com/@activeadmin/activeadmin/-/activeadmin-4.0.0-beta20.tgz#e11dfbfb5e4ff1f107db05451b696b1b76dbcb0f" + integrity sha512-xsA9aOTGAh6ZquOMSvNukMbIiuf+/+xesvXs0aZHA7h9Dqd9CpNzj19ns5rWmgJesXyY5hz3GJhrt+q7ApL0wQ== dependencies: "@rails/ujs" "7.1.600" flowbite "3.1.2"