Skip to content

Commit 084d249

Browse files
authored
Merge branch 'main' into nfujiu/foo
2 parents e5686bd + d7dfbbf commit 084d249

27 files changed

Lines changed: 256 additions & 228 deletions

Gemfile.lock

Lines changed: 83 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -3,66 +3,66 @@ GEM
33
specs:
44
action_text-trix (2.1.15)
55
railties
6-
actioncable (8.1.0)
7-
actionpack (= 8.1.0)
8-
activesupport (= 8.1.0)
6+
actioncable (8.1.1)
7+
actionpack (= 8.1.1)
8+
activesupport (= 8.1.1)
99
nio4r (~> 2.0)
1010
websocket-driver (>= 0.6.1)
1111
zeitwerk (~> 2.6)
12-
actionmailbox (8.1.0)
13-
actionpack (= 8.1.0)
14-
activejob (= 8.1.0)
15-
activerecord (= 8.1.0)
16-
activestorage (= 8.1.0)
17-
activesupport (= 8.1.0)
12+
actionmailbox (8.1.1)
13+
actionpack (= 8.1.1)
14+
activejob (= 8.1.1)
15+
activerecord (= 8.1.1)
16+
activestorage (= 8.1.1)
17+
activesupport (= 8.1.1)
1818
mail (>= 2.8.0)
19-
actionmailer (8.1.0)
20-
actionpack (= 8.1.0)
21-
actionview (= 8.1.0)
22-
activejob (= 8.1.0)
23-
activesupport (= 8.1.0)
19+
actionmailer (8.1.1)
20+
actionpack (= 8.1.1)
21+
actionview (= 8.1.1)
22+
activejob (= 8.1.1)
23+
activesupport (= 8.1.1)
2424
mail (>= 2.8.0)
2525
rails-dom-testing (~> 2.2)
26-
actionpack (8.1.0)
27-
actionview (= 8.1.0)
28-
activesupport (= 8.1.0)
26+
actionpack (8.1.1)
27+
actionview (= 8.1.1)
28+
activesupport (= 8.1.1)
2929
nokogiri (>= 1.8.5)
3030
rack (>= 2.2.4)
3131
rack-session (>= 1.0.1)
3232
rack-test (>= 0.6.3)
3333
rails-dom-testing (~> 2.2)
3434
rails-html-sanitizer (~> 1.6)
3535
useragent (~> 0.16)
36-
actiontext (8.1.0)
36+
actiontext (8.1.1)
3737
action_text-trix (~> 2.1.15)
38-
actionpack (= 8.1.0)
39-
activerecord (= 8.1.0)
40-
activestorage (= 8.1.0)
41-
activesupport (= 8.1.0)
38+
actionpack (= 8.1.1)
39+
activerecord (= 8.1.1)
40+
activestorage (= 8.1.1)
41+
activesupport (= 8.1.1)
4242
globalid (>= 0.6.0)
4343
nokogiri (>= 1.8.5)
44-
actionview (8.1.0)
45-
activesupport (= 8.1.0)
44+
actionview (8.1.1)
45+
activesupport (= 8.1.1)
4646
builder (~> 3.1)
4747
erubi (~> 1.11)
4848
rails-dom-testing (~> 2.2)
4949
rails-html-sanitizer (~> 1.6)
50-
activejob (8.1.0)
51-
activesupport (= 8.1.0)
50+
activejob (8.1.1)
51+
activesupport (= 8.1.1)
5252
globalid (>= 0.3.6)
53-
activemodel (8.1.0)
54-
activesupport (= 8.1.0)
55-
activerecord (8.1.0)
56-
activemodel (= 8.1.0)
57-
activesupport (= 8.1.0)
53+
activemodel (8.1.1)
54+
activesupport (= 8.1.1)
55+
activerecord (8.1.1)
56+
activemodel (= 8.1.1)
57+
activesupport (= 8.1.1)
5858
timeout (>= 0.4.0)
59-
activestorage (8.1.0)
60-
actionpack (= 8.1.0)
61-
activejob (= 8.1.0)
62-
activerecord (= 8.1.0)
63-
activesupport (= 8.1.0)
59+
activestorage (8.1.1)
60+
actionpack (= 8.1.1)
61+
activejob (= 8.1.1)
62+
activerecord (= 8.1.1)
63+
activesupport (= 8.1.1)
6464
marcel (~> 1.0)
65-
activesupport (8.1.0)
65+
activesupport (8.1.1)
6666
base64
6767
bigdecimal
6868
concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -82,9 +82,9 @@ GEM
8282
bcrypt (3.1.20)
8383
bigdecimal (3.3.1)
8484
bindex (0.8.1)
85-
bootsnap (1.18.6)
85+
bootsnap (1.19.0)
8686
msgpack (~> 1.2)
87-
brakeman (7.1.0)
87+
brakeman (7.1.1)
8888
racc
8989
builder (3.3.0)
9090
bundler-audit (0.9.2)
@@ -102,12 +102,12 @@ GEM
102102
concurrent-ruby (1.3.5)
103103
connection_pool (2.5.4)
104104
crass (1.0.6)
105-
date (3.4.1)
105+
date (3.5.0)
106106
debug (1.11.0)
107107
irb (~> 1.10)
108108
reline (>= 0.3.8)
109109
drb (2.2.3)
110-
erb (5.1.1)
110+
erb (6.0.0)
111111
erubi (1.13.1)
112112
et-orbi (1.4.0)
113113
tzinfo
@@ -123,14 +123,14 @@ GEM
123123
activesupport (>= 6.0.0)
124124
railties (>= 6.0.0)
125125
io-console (0.8.1)
126-
irb (1.15.2)
126+
irb (1.15.3)
127127
pp (>= 0.6.0)
128128
rdoc (>= 4.0.0)
129129
reline (>= 0.4.2)
130130
jbuilder (2.14.1)
131131
actionview (>= 7.0.0)
132132
activesupport (>= 7.0.0)
133-
json (2.15.2)
133+
json (2.16.0)
134134
language_server-protocol (3.17.0.5)
135135
lint_roller (1.1.0)
136136
logger (1.7.0)
@@ -146,7 +146,7 @@ GEM
146146
marcel (1.1.0)
147147
matrix (0.4.3)
148148
mini_mime (1.1.5)
149-
minitest (5.26.0)
149+
minitest (5.26.2)
150150
msgpack (1.8.0)
151151
net-imap (0.5.12)
152152
date
@@ -157,7 +157,7 @@ GEM
157157
timeout
158158
net-smtp (0.5.1)
159159
net-protocol
160-
nio4r (2.7.4)
160+
nio4r (2.7.5)
161161
nokogiri (1.18.10-aarch64-linux-gnu)
162162
racc (~> 1.4)
163163
nokogiri (1.18.10-aarch64-linux-musl)
@@ -194,55 +194,55 @@ GEM
194194
nio4r (~> 2.0)
195195
raabro (1.4.0)
196196
racc (1.8.1)
197-
rack (3.2.3)
197+
rack (3.2.4)
198198
rack-session (2.1.1)
199199
base64 (>= 0.1.0)
200200
rack (>= 3.0.0)
201201
rack-test (2.2.0)
202202
rack (>= 1.3)
203203
rackup (2.2.1)
204204
rack (>= 3)
205-
rails (8.1.0)
206-
actioncable (= 8.1.0)
207-
actionmailbox (= 8.1.0)
208-
actionmailer (= 8.1.0)
209-
actionpack (= 8.1.0)
210-
actiontext (= 8.1.0)
211-
actionview (= 8.1.0)
212-
activejob (= 8.1.0)
213-
activemodel (= 8.1.0)
214-
activerecord (= 8.1.0)
215-
activestorage (= 8.1.0)
216-
activesupport (= 8.1.0)
205+
rails (8.1.1)
206+
actioncable (= 8.1.1)
207+
actionmailbox (= 8.1.1)
208+
actionmailer (= 8.1.1)
209+
actionpack (= 8.1.1)
210+
actiontext (= 8.1.1)
211+
actionview (= 8.1.1)
212+
activejob (= 8.1.1)
213+
activemodel (= 8.1.1)
214+
activerecord (= 8.1.1)
215+
activestorage (= 8.1.1)
216+
activesupport (= 8.1.1)
217217
bundler (>= 1.15.0)
218-
railties (= 8.1.0)
218+
railties (= 8.1.1)
219219
rails-dom-testing (2.3.0)
220220
activesupport (>= 5.0.0)
221221
minitest
222222
nokogiri (>= 1.6)
223223
rails-html-sanitizer (1.6.2)
224224
loofah (~> 2.21)
225225
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)
226-
railties (8.1.0)
227-
actionpack (= 8.1.0)
228-
activesupport (= 8.1.0)
226+
railties (8.1.1)
227+
actionpack (= 8.1.1)
228+
activesupport (= 8.1.1)
229229
irb (~> 1.13)
230230
rackup (>= 1.0.0)
231231
rake (>= 12.2)
232232
thor (~> 1.0, >= 1.2.2)
233233
tsort (>= 0.2)
234234
zeitwerk (~> 2.6)
235235
rainbow (3.1.1)
236-
rake (13.3.0)
237-
rdoc (6.15.0)
236+
rake (13.3.1)
237+
rdoc (6.15.1)
238238
erb
239239
psych (>= 4.0.0)
240240
tsort
241241
regexp_parser (2.11.3)
242-
reline (0.6.2)
242+
reline (0.6.3)
243243
io-console (~> 0.5)
244244
rexml (3.4.4)
245-
rubocop (1.81.6)
245+
rubocop (1.81.7)
246246
json (~> 2.3)
247247
language_server-protocol (~> 3.17.0.2)
248248
lint_roller (~> 1.1.0)
@@ -253,14 +253,14 @@ GEM
253253
rubocop-ast (>= 1.47.1, < 2.0)
254254
ruby-progressbar (~> 1.7)
255255
unicode-display_width (>= 2.4.0, < 4.0)
256-
rubocop-ast (1.47.1)
256+
rubocop-ast (1.48.0)
257257
parser (>= 3.3.7.2)
258258
prism (~> 1.4)
259259
rubocop-performance (1.26.1)
260260
lint_roller (~> 1.1)
261261
rubocop (>= 1.75.0, < 2.0)
262262
rubocop-ast (>= 1.47.1, < 2.0)
263-
rubocop-rails (2.33.4)
263+
rubocop-rails (2.34.0)
264264
activesupport (>= 4.2.0)
265265
lint_roller (~> 1.1)
266266
rack (>= 1.1)
@@ -271,53 +271,53 @@ GEM
271271
rubocop-performance (>= 1.24)
272272
rubocop-rails (>= 2.30)
273273
ruby-progressbar (1.13.0)
274-
rubyzip (3.2.1)
274+
rubyzip (3.2.2)
275275
securerandom (0.4.1)
276276
selenium-webdriver (4.38.0)
277277
base64 (~> 0.2)
278278
logger (~> 1.4)
279279
rexml (~> 3.2, >= 3.2.5)
280280
rubyzip (>= 1.2.2, < 4.0)
281281
websocket (~> 1.0)
282-
solid_cache (1.0.8)
282+
solid_cache (1.0.10)
283283
activejob (>= 7.2)
284284
activerecord (>= 7.2)
285285
railties (>= 7.2)
286-
solid_queue (1.2.2)
286+
solid_queue (1.2.4)
287287
activejob (>= 7.1)
288288
activerecord (>= 7.1)
289289
concurrent-ruby (>= 1.3.1)
290290
fugit (~> 1.11)
291291
railties (>= 7.1)
292292
thor (>= 1.3.1)
293-
sqlite3 (2.7.4-aarch64-linux-gnu)
294-
sqlite3 (2.7.4-aarch64-linux-musl)
295-
sqlite3 (2.7.4-arm-linux-gnu)
296-
sqlite3 (2.7.4-arm-linux-musl)
297-
sqlite3 (2.7.4-arm64-darwin)
298-
sqlite3 (2.7.4-x86_64-darwin)
299-
sqlite3 (2.7.4-x86_64-linux-gnu)
300-
sqlite3 (2.7.4-x86_64-linux-musl)
293+
sqlite3 (2.8.0-aarch64-linux-gnu)
294+
sqlite3 (2.8.0-aarch64-linux-musl)
295+
sqlite3 (2.8.0-arm-linux-gnu)
296+
sqlite3 (2.8.0-arm-linux-musl)
297+
sqlite3 (2.8.0-arm64-darwin)
298+
sqlite3 (2.8.0-x86_64-darwin)
299+
sqlite3 (2.8.0-x86_64-linux-gnu)
300+
sqlite3 (2.8.0-x86_64-linux-musl)
301301
stimulus-rails (1.3.4)
302302
railties (>= 6.0.0)
303-
stringio (3.1.7)
303+
stringio (3.1.8)
304304
thor (1.4.0)
305305
thruster (0.1.16)
306306
thruster (0.1.16-aarch64-linux)
307307
thruster (0.1.16-arm64-darwin)
308308
thruster (0.1.16-x86_64-darwin)
309309
thruster (0.1.16-x86_64-linux)
310-
timeout (0.4.3)
310+
timeout (0.4.4)
311311
tsort (0.2.0)
312-
turbo-rails (2.0.17)
312+
turbo-rails (2.0.20)
313313
actionpack (>= 7.1.0)
314314
railties (>= 7.1.0)
315315
tzinfo (2.0.6)
316316
concurrent-ruby (~> 1.0)
317317
unicode-display_width (3.2.0)
318318
unicode-emoji (~> 4.1)
319319
unicode-emoji (4.1.0)
320-
uri (1.0.4)
320+
uri (1.1.1)
321321
useragent (0.16.11)
322322
web-console (4.2.1)
323323
actionview (>= 6.0.0)

0 commit comments

Comments
 (0)