Skip to content

Commit ca701cf

Browse files
committed
Update Rails and Active Admin
1 parent cc174ae commit ca701cf

File tree

4 files changed

+165
-102
lines changed

4 files changed

+165
-102
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ gem "sprockets-rails"
1212
gem "cssbundling-rails"
1313
gem "importmap-rails"
1414

15-
gem "activeadmin", "4.0.0.beta15" # github: "activeadmin/activeadmin", branch: "master"
15+
gem "activeadmin", "4.0.0.beta16" # github: "activeadmin/activeadmin", branch: "master"
1616
gem "devise"
1717

1818
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem

Gemfile.lock

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,74 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (8.0.2)
5-
actionpack (= 8.0.2)
6-
activesupport (= 8.0.2)
4+
actioncable (8.0.2.1)
5+
actionpack (= 8.0.2.1)
6+
activesupport (= 8.0.2.1)
77
nio4r (~> 2.0)
88
websocket-driver (>= 0.6.1)
99
zeitwerk (~> 2.6)
10-
actionmailbox (8.0.2)
11-
actionpack (= 8.0.2)
12-
activejob (= 8.0.2)
13-
activerecord (= 8.0.2)
14-
activestorage (= 8.0.2)
15-
activesupport (= 8.0.2)
10+
actionmailbox (8.0.2.1)
11+
actionpack (= 8.0.2.1)
12+
activejob (= 8.0.2.1)
13+
activerecord (= 8.0.2.1)
14+
activestorage (= 8.0.2.1)
15+
activesupport (= 8.0.2.1)
1616
mail (>= 2.8.0)
17-
actionmailer (8.0.2)
18-
actionpack (= 8.0.2)
19-
actionview (= 8.0.2)
20-
activejob (= 8.0.2)
21-
activesupport (= 8.0.2)
17+
actionmailer (8.0.2.1)
18+
actionpack (= 8.0.2.1)
19+
actionview (= 8.0.2.1)
20+
activejob (= 8.0.2.1)
21+
activesupport (= 8.0.2.1)
2222
mail (>= 2.8.0)
2323
rails-dom-testing (~> 2.2)
24-
actionpack (8.0.2)
25-
actionview (= 8.0.2)
26-
activesupport (= 8.0.2)
24+
actionpack (8.0.2.1)
25+
actionview (= 8.0.2.1)
26+
activesupport (= 8.0.2.1)
2727
nokogiri (>= 1.8.5)
2828
rack (>= 2.2.4)
2929
rack-session (>= 1.0.1)
3030
rack-test (>= 0.6.3)
3131
rails-dom-testing (~> 2.2)
3232
rails-html-sanitizer (~> 1.6)
3333
useragent (~> 0.16)
34-
actiontext (8.0.2)
35-
actionpack (= 8.0.2)
36-
activerecord (= 8.0.2)
37-
activestorage (= 8.0.2)
38-
activesupport (= 8.0.2)
34+
actiontext (8.0.2.1)
35+
actionpack (= 8.0.2.1)
36+
activerecord (= 8.0.2.1)
37+
activestorage (= 8.0.2.1)
38+
activesupport (= 8.0.2.1)
3939
globalid (>= 0.6.0)
4040
nokogiri (>= 1.8.5)
41-
actionview (8.0.2)
42-
activesupport (= 8.0.2)
41+
actionview (8.0.2.1)
42+
activesupport (= 8.0.2.1)
4343
builder (~> 3.1)
4444
erubi (~> 1.11)
4545
rails-dom-testing (~> 2.2)
4646
rails-html-sanitizer (~> 1.6)
47-
activeadmin (4.0.0.beta15)
47+
activeadmin (4.0.0.beta16)
4848
arbre (~> 2.0)
4949
csv
50-
formtastic (>= 3.1)
51-
formtastic_i18n (>= 0.4)
50+
formtastic (>= 5.0)
51+
formtastic_i18n (>= 0.7)
5252
inherited_resources (~> 2.0)
5353
kaminari (>= 1.2.1)
5454
railties (>= 7.0)
5555
ransack (>= 4.0)
56-
activejob (8.0.2)
57-
activesupport (= 8.0.2)
56+
activejob (8.0.2.1)
57+
activesupport (= 8.0.2.1)
5858
globalid (>= 0.3.6)
59-
activemodel (8.0.2)
60-
activesupport (= 8.0.2)
61-
activerecord (8.0.2)
62-
activemodel (= 8.0.2)
63-
activesupport (= 8.0.2)
59+
activemodel (8.0.2.1)
60+
activesupport (= 8.0.2.1)
61+
activerecord (8.0.2.1)
62+
activemodel (= 8.0.2.1)
63+
activesupport (= 8.0.2.1)
6464
timeout (>= 0.4.0)
65-
activestorage (8.0.2)
66-
actionpack (= 8.0.2)
67-
activejob (= 8.0.2)
68-
activerecord (= 8.0.2)
69-
activesupport (= 8.0.2)
65+
activestorage (8.0.2.1)
66+
actionpack (= 8.0.2.1)
67+
activejob (= 8.0.2.1)
68+
activerecord (= 8.0.2.1)
69+
activesupport (= 8.0.2.1)
7070
marcel (~> 1.0)
71-
activesupport (8.0.2)
71+
activesupport (8.0.2.1)
7272
base64
7373
benchmark (>= 0.3)
7474
bigdecimal
@@ -205,30 +205,30 @@ GEM
205205
rack (>= 1.3)
206206
rackup (2.2.1)
207207
rack (>= 3)
208-
rails (8.0.2)
209-
actioncable (= 8.0.2)
210-
actionmailbox (= 8.0.2)
211-
actionmailer (= 8.0.2)
212-
actionpack (= 8.0.2)
213-
actiontext (= 8.0.2)
214-
actionview (= 8.0.2)
215-
activejob (= 8.0.2)
216-
activemodel (= 8.0.2)
217-
activerecord (= 8.0.2)
218-
activestorage (= 8.0.2)
219-
activesupport (= 8.0.2)
208+
rails (8.0.2.1)
209+
actioncable (= 8.0.2.1)
210+
actionmailbox (= 8.0.2.1)
211+
actionmailer (= 8.0.2.1)
212+
actionpack (= 8.0.2.1)
213+
actiontext (= 8.0.2.1)
214+
actionview (= 8.0.2.1)
215+
activejob (= 8.0.2.1)
216+
activemodel (= 8.0.2.1)
217+
activerecord (= 8.0.2.1)
218+
activestorage (= 8.0.2.1)
219+
activesupport (= 8.0.2.1)
220220
bundler (>= 1.15.0)
221-
railties (= 8.0.2)
221+
railties (= 8.0.2.1)
222222
rails-dom-testing (2.3.0)
223223
activesupport (>= 5.0.0)
224224
minitest
225225
nokogiri (>= 1.6)
226226
rails-html-sanitizer (1.6.2)
227227
loofah (~> 2.21)
228228
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)
229-
railties (8.0.2)
230-
actionpack (= 8.0.2)
231-
activesupport (= 8.0.2)
229+
railties (8.0.2.1)
230+
actionpack (= 8.0.2.1)
231+
activesupport (= 8.0.2.1)
232232
irb (~> 1.13)
233233
rackup (>= 1.0.0)
234234
rake (>= 12.2)
@@ -242,20 +242,20 @@ GEM
242242
rdoc (6.14.2)
243243
erb
244244
psych (>= 4.0.0)
245-
regexp_parser (2.10.0)
245+
regexp_parser (2.11.2)
246246
reline (0.6.2)
247247
io-console (~> 0.5)
248248
responders (3.1.1)
249249
actionpack (>= 5.2)
250250
railties (>= 5.2)
251251
rexml (3.4.1)
252-
rubyzip (2.4.1)
252+
rubyzip (3.0.1)
253253
securerandom (0.4.1)
254-
selenium-webdriver (4.34.0)
254+
selenium-webdriver (4.35.0)
255255
base64 (~> 0.2)
256256
logger (~> 1.4)
257257
rexml (~> 3.2, >= 3.2.5)
258-
rubyzip (>= 1.2.2, < 3.0)
258+
rubyzip (>= 1.2.2, < 4.0)
259259
websocket (~> 1.0)
260260
simplecov (0.22.0)
261261
docile (~> 1.1)
@@ -303,7 +303,7 @@ PLATFORMS
303303
x86_64-linux
304304

305305
DEPENDENCIES
306-
activeadmin (= 4.0.0.beta15)
306+
activeadmin (= 4.0.0.beta16)
307307
capybara
308308
cssbundling-rails
309309
debug

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "app",
33
"private": "true",
44
"dependencies": {
5-
"@activeadmin/activeadmin": "4.0.0-beta15",
5+
"@activeadmin/activeadmin": "4.0.0-beta16",
66
"tailwindcss": "^3.4.17"
77
},
88
"scripts": {

0 commit comments

Comments
 (0)