Skip to content

Commit 0f2a36c

Browse files
authored
Update ActiveAdmin to 4.0.0.beta22 (#936)
1 parent f48f8f8 commit 0f2a36c

4 files changed

Lines changed: 70 additions & 76 deletions

File tree

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ gem "sprockets-rails"
1212
gem "cssbundling-rails", "1.4.2" # TODO: relax this dependency when rails/cssbundling-rails#169 will be fixed
1313
gem "importmap-rails"
1414

15-
gem "activeadmin", "4.0.0.beta21" # github: "activeadmin/activeadmin", branch: "master"
16-
gem "devise", "~> 4.9" # TODO: relax this dependency when formtastic/formtastic#1401 will be fixed
15+
gem "activeadmin", "4.0.0.beta22" # github: "activeadmin/activeadmin", branch: "master"
16+
gem "devise"
1717

1818
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
1919
gem "tzinfo-data", platforms: %i[ windows jruby ]

Gemfile.lock

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ GEM
4747
erubi (~> 1.11)
4848
rails-dom-testing (~> 2.2)
4949
rails-html-sanitizer (~> 1.6)
50-
activeadmin (4.0.0.beta21)
50+
activeadmin (4.0.0.beta22)
5151
arbre (~> 2.0)
5252
csv
53-
formtastic (>= 5.0)
53+
formtastic (>= 6.0)
5454
formtastic_i18n (>= 0.7)
5555
inherited_resources (~> 2.0)
5656
kaminari (>= 1.2.1)
@@ -84,7 +84,7 @@ GEM
8484
securerandom (>= 0.3)
8585
tzinfo (~> 2.0, >= 2.0.5)
8686
uri (>= 0.13.1)
87-
addressable (2.8.8)
87+
addressable (2.8.9)
8888
public_suffix (>= 2.0.2, < 8.0)
8989
arbre (2.2.1)
9090
activesupport (>= 7.0)
@@ -111,18 +111,18 @@ GEM
111111
debug (1.11.1)
112112
irb (~> 1.10)
113113
reline (>= 0.3.8)
114-
devise (4.9.4)
114+
devise (5.0.2)
115115
bcrypt (~> 3.0)
116116
orm_adapter (~> 0.1)
117-
railties (>= 4.1.0)
117+
railties (>= 7.0)
118118
responders
119119
warden (~> 1.2.3)
120120
docile (1.4.1)
121121
drb (2.2.3)
122-
erb (6.0.1)
122+
erb (6.0.2)
123123
erubi (1.13.1)
124-
formtastic (5.0.0)
125-
actionpack (>= 6.0.0)
124+
formtastic (6.0.0)
125+
actionpack (>= 7.2.0)
126126
formtastic_i18n (0.7.0)
127127
globalid (1.3.0)
128128
activesupport (>= 6.1)
@@ -146,7 +146,7 @@ GEM
146146
prism (>= 1.3.0)
147147
rdoc (>= 4.0.0)
148148
reline (>= 0.4.2)
149-
json (2.18.1)
149+
json (2.19.1)
150150
kaminari (1.2.2)
151151
activesupport (>= 4.1.0)
152152
kaminari-actionview (= 1.2.2)
@@ -172,8 +172,8 @@ GEM
172172
marcel (1.1.0)
173173
matrix (0.4.3)
174174
mini_mime (1.1.5)
175-
mini_portile2 (2.8.9)
176-
minitest (6.0.1)
175+
minitest (6.0.2)
176+
drb (~> 2.0)
177177
prism (~> 1.5)
178178
net-imap (0.6.3)
179179
date
@@ -185,9 +185,6 @@ GEM
185185
net-smtp (0.5.1)
186186
net-protocol
187187
nio4r (2.7.5)
188-
nokogiri (1.19.1)
189-
mini_portile2 (~> 2.8.2)
190-
racc (~> 1.4)
191188
nokogiri (1.19.1-aarch64-linux-gnu)
192189
racc (~> 1.4)
193190
nokogiri (1.19.1-arm64-darwin)
@@ -204,7 +201,7 @@ GEM
204201
psych (5.3.1)
205202
date
206203
stringio
207-
public_suffix (7.0.2)
204+
public_suffix (7.0.5)
208205
puma (7.2.0)
209206
nio4r (~> 2.0)
210207
racc (1.8.1)
@@ -234,8 +231,8 @@ GEM
234231
activesupport (>= 5.0.0)
235232
minitest
236233
nokogiri (>= 1.6)
237-
rails-html-sanitizer (1.6.2)
238-
loofah (~> 2.21)
234+
rails-html-sanitizer (1.7.0)
235+
loofah (~> 2.25)
239236
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
240237
railties (8.1.2)
241238
actionpack (= 8.1.2)
@@ -287,8 +284,6 @@ GEM
287284
actionpack (>= 6.1)
288285
activesupport (>= 6.1)
289286
sprockets (>= 3.0.0)
290-
sqlite3 (2.9.1)
291-
mini_portile2 (~> 2.8.0)
292287
sqlite3 (2.9.1-aarch64-linux-gnu)
293288
sqlite3 (2.9.1-arm64-darwin)
294289
sqlite3 (2.9.1-x86_64-darwin)
@@ -310,21 +305,20 @@ GEM
310305
websocket-extensions (0.1.5)
311306
xpath (3.2.0)
312307
nokogiri (~> 1.8)
313-
zeitwerk (2.7.4)
308+
zeitwerk (2.7.5)
314309

315310
PLATFORMS
316311
aarch64-linux
317312
arm64-darwin
318-
ruby
319313
x86_64-darwin
320314
x86_64-linux
321315

322316
DEPENDENCIES
323-
activeadmin (= 4.0.0.beta21)
317+
activeadmin (= 4.0.0.beta22)
324318
capybara
325319
cssbundling-rails (= 1.4.2)
326320
debug
327-
devise (~> 4.9)
321+
devise
328322
importmap-rails
329323
puma
330324
rails (~> 8.1.2)
@@ -339,4 +333,4 @@ RUBY VERSION
339333
ruby 4.0.0
340334

341335
BUNDLED WITH
342-
4.0.5
336+
4.0.7

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
"private": "true",
44
"type": "module",
55
"dependencies": {
6-
"@activeadmin/activeadmin": "4.0.0-beta21",
7-
"@tailwindcss/cli": "^4.1.18",
8-
"tailwindcss": "^4.1.18"
6+
"@activeadmin/activeadmin": "4.0.0-beta22",
7+
"@tailwindcss/cli": "^4.2.1",
8+
"tailwindcss": "^4.2.1"
99
},
1010
"scripts": {
1111
"build:css": "npx @tailwindcss/cli -i ./app/assets/stylesheets/active_admin.css -o ./app/assets/builds/active_admin.css --minify"

0 commit comments

Comments
 (0)