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 Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ gem "sprockets-rails"
gem "cssbundling-rails"
gem "importmap-rails"

gem "activeadmin", "4.0.0.beta14" # github: "activeadmin/activeadmin", branch: "master"
gem "activeadmin", "4.0.0.beta15" # github: "activeadmin/activeadmin", branch: "master"
gem "devise"

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
Expand Down
10 changes: 5 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ GEM
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activeadmin (4.0.0.beta14)
activeadmin (4.0.0.beta15)
arbre (~> 2.0)
csv
formtastic (>= 3.1)
Expand Down Expand Up @@ -83,8 +83,8 @@ GEM
tzinfo (~> 2.0, >= 2.0.5)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
arbre (2.0.2)
activesupport (>= 3.0.0)
arbre (2.1.0)
activesupport (>= 7.0)
base64 (0.2.0)
bcrypt (3.1.20)
benchmark (0.4.0)
Expand All @@ -104,7 +104,7 @@ GEM
crass (1.0.6)
cssbundling-rails (1.4.1)
railties (>= 6.0.0)
csv (3.3.0)
csv (3.3.2)
date (3.4.1)
debug (1.10.0)
irb (~> 1.10)
Expand Down Expand Up @@ -293,7 +293,7 @@ PLATFORMS
x86_64-linux

DEPENDENCIES
activeadmin (= 4.0.0.beta14)
activeadmin (= 4.0.0.beta15)
capybara
cssbundling-rails
debug
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "app",
"private": "true",
"dependencies": {
"@activeadmin/activeadmin": "4.0.0-beta9",
"@activeadmin/activeadmin": "4.0.0-beta15",
"tailwindcss": "^3.4.10"
},
"scripts": {
Expand Down
18 changes: 9 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
# yarn lockfile v1


"@activeadmin/[email protected]beta9":
version "4.0.0-beta9"
resolved "https://registry.yarnpkg.com/@activeadmin/activeadmin/-/activeadmin-4.0.0-beta9.tgz#b0e77bbffd94a1c428f34cb32640cb61fb329964"
integrity sha512-nsUSI4M5Zrujyjw92yQv/cV2edj7E6+D1HNZG0zqz98miPOxzPBJDXwpvQkE/iYSIeqc99NlLobFHxYXuzeB7Q==
"@activeadmin/[email protected]beta15":
version "4.0.0-beta15"
resolved "https://registry.yarnpkg.com/@activeadmin/activeadmin/-/activeadmin-4.0.0-beta15.tgz#5cfa3274826234073f138ae3507ea8e990475f84"
integrity sha512-TRQtxZ7lg/0lrxpRzanQwAoQnkYTgjpYkhk/N9UZQHhEans9Ra35blw2tO87NEdpYhMdos/hoHOTumczganHqw==
dependencies:
"@rails/ujs" "7.1.2"
"@rails/ujs" "7.1.400"
flowbite "2.3.0"

"@alloc/quick-lru@^5.2.0":
Expand Down Expand Up @@ -90,10 +90,10 @@
resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f"
integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==

"@rails/[email protected].2":
version "7.1.2"
resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-7.1.2.tgz#ea903bcc0224e17156015d995b6f1b83e27d64b2"
integrity sha512-c5x02djEKEVVE4qfN4XgElJS4biM0xxtIVpcJ0ZHLK116U19rowTtmD0AJ/RCb3Xaewa4GPIWLlwgeC0dCQqzw==
"@rails/[email protected].400":
version "7.1.400"
resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-7.1.400.tgz#b2a76bdccb5197b9e866954536106386c87cfab5"
integrity sha512-YwvXm3BR5tn+VCAKYGycLejMRVZE3Ionj5gFjEeGXCZnI0Rpi+7dKpmyu90kdUY7dRUFpHTdu9zZceEzFLl38w==

ansi-regex@^5.0.1:
version "5.0.1"
Expand Down
Loading