Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.4.6
3.4.7
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ source "https://rubygems.org"

ruby file: ".ruby-version"

gem "rails", "~> 8.0.2"
gem "rails", "~> 8.0.3"
gem "sqlite3"
gem "puma"

gem "sprockets-rails"
gem "cssbundling-rails"
gem "importmap-rails"

gem "activeadmin", "4.0.0.beta16" # github: "activeadmin/activeadmin", branch: "master"
gem "activeadmin", "4.0.0.beta17" # github: "activeadmin/activeadmin", branch: "master"
gem "devise"

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
Expand Down
22 changes: 9 additions & 13 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ GEM
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activeadmin (4.0.0.beta16)
activeadmin (4.0.0.beta17)
arbre (~> 2.0)
csv
formtastic (>= 5.0)
Expand Down Expand Up @@ -83,7 +83,7 @@ GEM
uri (>= 0.13.1)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
arbre (2.2.0)
arbre (2.2.1)
activesupport (>= 7.0)
base64 (0.3.0)
bcrypt (3.1.20)
Expand Down Expand Up @@ -117,7 +117,7 @@ GEM
warden (~> 1.2.3)
docile (1.4.1)
drb (2.2.3)
erb (5.0.3)
erb (5.1.1)
erubi (1.13.1)
formtastic (5.0.0)
actionpack (>= 6.0.0)
Expand All @@ -143,7 +143,6 @@ GEM
pp (>= 0.6.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
json (2.13.2)
kaminari (1.2.2)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.2.2)
Expand Down Expand Up @@ -191,12 +190,11 @@ GEM
pp (0.6.3)
prettyprint
prettyprint (0.2.0)
prism (1.4.0)
psych (5.2.6)
date
stringio
public_suffix (6.0.2)
puma (7.0.4)
puma (7.1.0)
nio4r (~> 2.0)
racc (1.8.1)
rack (3.2.3)
Expand Down Expand Up @@ -253,13 +251,11 @@ GEM
actionpack (>= 7.0)
railties (>= 7.0)
rexml (3.4.4)
rubyzip (3.1.1)
rubyzip (3.2.0)
securerandom (0.4.1)
selenium-webdriver (4.36.0)
selenium-webdriver (4.37.0)
base64 (~> 0.2)
json (<= 2.13.2)
logger (~> 1.4)
prism (~> 1.0, < 1.5)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 4.0)
websocket (~> 1.0)
Expand Down Expand Up @@ -310,14 +306,14 @@ PLATFORMS
x86_64-linux

DEPENDENCIES
activeadmin (= 4.0.0.beta16)
activeadmin (= 4.0.0.beta17)
capybara
cssbundling-rails
debug
devise
importmap-rails
puma
rails (~> 8.0.2)
rails (~> 8.0.3)
selenium-webdriver
simplecov
simplecov-cobertura
Expand All @@ -326,7 +322,7 @@ DEPENDENCIES
tzinfo-data

RUBY VERSION
ruby 3.4.6p54
ruby 3.4.7p58

BUNDLED WITH
2.7.2
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"name": "app",
"private": "true",
"dependencies": {
"@activeadmin/activeadmin": "4.0.0-beta16",
"tailwindcss": "^3.4.17"
"@activeadmin/activeadmin": "4.0.0-beta17",
"tailwindcss": "^3.4.18"
},
"scripts": {
"build:css": "tailwindcss -i ./app/assets/stylesheets/active_admin.css -o ./app/assets/builds/active_admin.css --minify -c tailwind-active_admin.config.js"
Expand Down
50 changes: 22 additions & 28 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# yarn lockfile v1


"@activeadmin/activeadmin@4.0.0-beta16":
version "4.0.0-beta16"
resolved "https://registry.yarnpkg.com/@activeadmin/activeadmin/-/activeadmin-4.0.0-beta16.tgz#ffc38317fe197ce5f3a8f423fab6c7fae11b4a91"
integrity sha512-bZIVmRCqf0xQdwP9dfyS4YD32PXNJWsyzq2cPwaE2tuU/XsH7q9jQaAkh/TcZhXjyXaznb4wKV9NidaZT28wjQ==
"@activeadmin/activeadmin@4.0.0-beta17":
version "4.0.0-beta17"
resolved "https://registry.yarnpkg.com/@activeadmin/activeadmin/-/activeadmin-4.0.0-beta17.tgz#ac6f48eea77409ee775f6394fe79b79a47039852"
integrity sha512-BYs91o0OgatyeDDqEyuqoFbybd6SevPVEzt12acnQ9S2qb1AOPGfyLbiJNo9wzEHou6K0vnzQzDXUadU42wyRA==
dependencies:
"@rails/ujs" "7.1.501"
flowbite "3.1.2"
Expand Down Expand Up @@ -379,7 +379,7 @@ is-binary-path@~2.1.0:
dependencies:
binary-extensions "^2.0.0"

is-core-module@^2.16.0:
is-core-module@^2.16.1:
version "2.16.1"
resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.16.1.tgz#2a98801a849f43e2add644fbb6bc6229b19a4ef4"
integrity sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==
Expand Down Expand Up @@ -427,12 +427,12 @@ jackspeak@^3.1.2:
optionalDependencies:
"@pkgjs/parseargs" "^0.11.0"

jiti@^1.21.6:
jiti@^1.21.7:
version "1.21.7"
resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.7.tgz#9dd81043424a3d28458b193d965f0d18a2300ba9"
integrity sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==

lilconfig@^3.0.0, lilconfig@^3.1.3:
lilconfig@^3.1.1, lilconfig@^3.1.3:
version "3.1.3"
resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-3.1.3.tgz#a1bcfd6257f9585bf5ae14ceeebb7b559025e4c4"
integrity sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==
Expand Down Expand Up @@ -570,13 +570,12 @@ postcss-js@^4.0.1:
dependencies:
camelcase-css "^2.0.1"

postcss-load-config@^4.0.2:
version "4.0.2"
resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-4.0.2.tgz#7159dcf626118d33e299f485d6afe4aff7c4a3e3"
integrity sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==
"postcss-load-config@^4.0.2 || ^5.0 || ^6.0":
version "6.0.1"
resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-6.0.1.tgz#6fd7dcd8ae89badcf1b2d644489cbabf83aa8096"
integrity sha512-oPtTM4oerL+UXmx+93ytZVN82RrlY/wPUV8IeDxFrzIjXOLF1pN+EmKPLbubvKHT2HC20xXsCAH2Z+CKV6Oz/g==
dependencies:
lilconfig "^3.0.0"
yaml "^2.3.4"
lilconfig "^3.1.1"

postcss-nested@^6.2.0:
version "6.2.0"
Expand Down Expand Up @@ -627,11 +626,11 @@ readdirp@~3.6.0:
picomatch "^2.2.1"

resolve@^1.1.7, resolve@^1.22.1, resolve@^1.22.8:
version "1.22.10"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.10.tgz#b663e83ffb09bbf2386944736baae803029b8b39"
integrity sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==
version "1.22.11"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.11.tgz#aad857ce1ffb8bfa9b0b1ac29f1156383f68c262"
integrity sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==
dependencies:
is-core-module "^2.16.0"
is-core-module "^2.16.1"
path-parse "^1.0.7"
supports-preserve-symlinks-flag "^1.0.0"

Expand Down Expand Up @@ -735,10 +734,10 @@ supports-preserve-symlinks-flag@^1.0.0:
resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==

tailwindcss@^3.4.17:
version "3.4.17"
resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.17.tgz#ae8406c0f96696a631c790768ff319d46d5e5a63"
integrity sha512-w33E2aCvSDP0tW9RZuNXadXlkHXqFzSkQew/aIa2i/Sj8fThxwovwlXHSPXTbAHwEIhBFXAedUhP2tueAKP8Og==
tailwindcss@^3.4.18:
version "3.4.18"
resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.18.tgz#9fa9650aace186644b608242f1e57d2d55593301"
integrity sha512-6A2rnmW5xZMdw11LYjhcI5846rt9pbLSabY5XPxo+XWdxwZaFEn47Go4NzFiHu9sNNmr/kXivP1vStfvMaK1GQ==
dependencies:
"@alloc/quick-lru" "^5.2.0"
arg "^5.0.2"
Expand All @@ -748,7 +747,7 @@ tailwindcss@^3.4.17:
fast-glob "^3.3.2"
glob-parent "^6.0.2"
is-glob "^4.0.3"
jiti "^1.21.6"
jiti "^1.21.7"
lilconfig "^3.1.3"
micromatch "^4.0.8"
normalize-path "^3.0.0"
Expand All @@ -757,7 +756,7 @@ tailwindcss@^3.4.17:
postcss "^8.4.47"
postcss-import "^15.1.0"
postcss-js "^4.0.1"
postcss-load-config "^4.0.2"
postcss-load-config "^4.0.2 || ^5.0 || ^6.0"
postcss-nested "^6.2.0"
postcss-selector-parser "^6.1.2"
resolve "^1.22.8"
Expand Down Expand Up @@ -818,8 +817,3 @@ wrap-ansi@^8.1.0:
ansi-styles "^6.1.0"
string-width "^5.0.1"
strip-ansi "^7.0.1"

yaml@^2.3.4:
version "2.8.1"
resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.8.1.tgz#1870aa02b631f7e8328b93f8bc574fac5d6c4d79"
integrity sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==