Skip to content

Commit 826fdcb

Browse files
authored
Merge pull request #393 from echarp/rails7
feat: Update gem dependencies and sitemap generator
2 parents e718ec1 + a8b3b53 commit 826fdcb

File tree

3 files changed

+98
-91
lines changed

3 files changed

+98
-91
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ gem "mysql2", "~>0.5.0"
3232
gem "nokogiri", "~>1.10"
3333
gem "redis", "~>5.0"
3434
gem "rinku", "~>2.0"
35-
gem "sitemap_generator", "~>2.1"
35+
gem "sitemap_generator"
3636
gem "state_machines-activerecord"
3737

3838
# Gems used for assets

Gemfile.lock

Lines changed: 93 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -42,35 +42,35 @@ GIT
4242
GEM
4343
remote: https://rubygems.org/
4444
specs:
45-
actioncable (7.1.3.2)
46-
actionpack (= 7.1.3.2)
47-
activesupport (= 7.1.3.2)
45+
actioncable (7.1.3.4)
46+
actionpack (= 7.1.3.4)
47+
activesupport (= 7.1.3.4)
4848
nio4r (~> 2.0)
4949
websocket-driver (>= 0.6.1)
5050
zeitwerk (~> 2.6)
51-
actionmailbox (7.1.3.2)
52-
actionpack (= 7.1.3.2)
53-
activejob (= 7.1.3.2)
54-
activerecord (= 7.1.3.2)
55-
activestorage (= 7.1.3.2)
56-
activesupport (= 7.1.3.2)
51+
actionmailbox (7.1.3.4)
52+
actionpack (= 7.1.3.4)
53+
activejob (= 7.1.3.4)
54+
activerecord (= 7.1.3.4)
55+
activestorage (= 7.1.3.4)
56+
activesupport (= 7.1.3.4)
5757
mail (>= 2.7.1)
5858
net-imap
5959
net-pop
6060
net-smtp
61-
actionmailer (7.1.3.2)
62-
actionpack (= 7.1.3.2)
63-
actionview (= 7.1.3.2)
64-
activejob (= 7.1.3.2)
65-
activesupport (= 7.1.3.2)
61+
actionmailer (7.1.3.4)
62+
actionpack (= 7.1.3.4)
63+
actionview (= 7.1.3.4)
64+
activejob (= 7.1.3.4)
65+
activesupport (= 7.1.3.4)
6666
mail (~> 2.5, >= 2.5.4)
6767
net-imap
6868
net-pop
6969
net-smtp
7070
rails-dom-testing (~> 2.2)
71-
actionpack (7.1.3.2)
72-
actionview (= 7.1.3.2)
73-
activesupport (= 7.1.3.2)
71+
actionpack (7.1.3.4)
72+
actionview (= 7.1.3.4)
73+
activesupport (= 7.1.3.4)
7474
nokogiri (>= 1.8.5)
7575
racc
7676
rack (>= 2.2.4)
@@ -80,35 +80,35 @@ GEM
8080
rails-html-sanitizer (~> 1.6)
8181
actionpack-page_caching (1.2.4)
8282
actionpack (>= 4.0.0)
83-
actiontext (7.1.3.2)
84-
actionpack (= 7.1.3.2)
85-
activerecord (= 7.1.3.2)
86-
activestorage (= 7.1.3.2)
87-
activesupport (= 7.1.3.2)
83+
actiontext (7.1.3.4)
84+
actionpack (= 7.1.3.4)
85+
activerecord (= 7.1.3.4)
86+
activestorage (= 7.1.3.4)
87+
activesupport (= 7.1.3.4)
8888
globalid (>= 0.6.0)
8989
nokogiri (>= 1.8.5)
90-
actionview (7.1.3.2)
91-
activesupport (= 7.1.3.2)
90+
actionview (7.1.3.4)
91+
activesupport (= 7.1.3.4)
9292
builder (~> 3.1)
9393
erubi (~> 1.11)
9494
rails-dom-testing (~> 2.2)
9595
rails-html-sanitizer (~> 1.6)
96-
activejob (7.1.3.2)
97-
activesupport (= 7.1.3.2)
96+
activejob (7.1.3.4)
97+
activesupport (= 7.1.3.4)
9898
globalid (>= 0.3.6)
99-
activemodel (7.1.3.2)
100-
activesupport (= 7.1.3.2)
101-
activerecord (7.1.3.2)
102-
activemodel (= 7.1.3.2)
103-
activesupport (= 7.1.3.2)
99+
activemodel (7.1.3.4)
100+
activesupport (= 7.1.3.4)
101+
activerecord (7.1.3.4)
102+
activemodel (= 7.1.3.4)
103+
activesupport (= 7.1.3.4)
104104
timeout (>= 0.4.0)
105-
activestorage (7.1.3.2)
106-
actionpack (= 7.1.3.2)
107-
activejob (= 7.1.3.2)
108-
activerecord (= 7.1.3.2)
109-
activesupport (= 7.1.3.2)
105+
activestorage (7.1.3.4)
106+
actionpack (= 7.1.3.4)
107+
activejob (= 7.1.3.4)
108+
activerecord (= 7.1.3.4)
109+
activesupport (= 7.1.3.4)
110110
marcel (~> 1.0)
111-
activesupport (7.1.3.2)
111+
activesupport (7.1.3.4)
112112
base64
113113
bigdecimal
114114
concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -118,8 +118,9 @@ GEM
118118
minitest (>= 5.1)
119119
mutex_m
120120
tzinfo (~> 2.0)
121-
acts_as_list (1.1.0)
122-
activerecord (>= 4.2)
121+
acts_as_list (1.2.1)
122+
activerecord (>= 6.1)
123+
activesupport (>= 6.1)
123124
addressable (2.8.6)
124125
public_suffix (>= 2.0.2, < 6.0)
125126
annotate (3.2.0)
@@ -132,15 +133,15 @@ GEM
132133
erubi (>= 1.0.0)
133134
rack (>= 0.9.0)
134135
rouge (>= 1.0.0)
135-
bigdecimal (3.1.7)
136+
bigdecimal (3.1.8)
136137
bindex (0.8.1)
137138
binding_of_caller (1.0.1)
138139
debug_inspector (>= 1.2.0)
139140
bitfields (0.14.0)
140141
activerecord (>= 5.1)
141142
bootsnap (1.18.3)
142143
msgpack (~> 1.2)
143-
builder (3.2.4)
144+
builder (3.3.0)
144145
byebug (11.1.3)
145146
canable (0.3.0)
146147
carrierwave (3.0.7)
@@ -151,19 +152,19 @@ GEM
151152
marcel (~> 1.0.0)
152153
ssrf_filter (~> 1.0)
153154
childprocess (5.0.0)
154-
concurrent-ruby (1.2.3)
155+
concurrent-ruby (1.3.2)
155156
connection_pool (2.4.1)
156157
crass (1.0.6)
157158
date (3.3.4)
158159
debug_inspector (1.2.0)
159-
devise (4.9.3)
160+
devise (4.9.4)
160161
bcrypt (~> 3.0)
161162
orm_adapter (~> 0.1)
162163
railties (>= 4.1.0)
163164
responders
164165
warden (~> 1.2.3)
165166
docile (1.4.0)
166-
doorkeeper (5.6.9)
167+
doorkeeper (5.7.0)
167168
railties (>= 5)
168169
drb (2.2.1)
169170
erubi (1.12.0)
@@ -187,7 +188,7 @@ GEM
187188
html_truncator (0.4.2)
188189
nokogiri (~> 1.5)
189190
htmlentities (4.3.4)
190-
i18n (1.14.4)
191+
i18n (1.14.5)
191192
concurrent-ruby (~> 1.0)
192193
image_processing (1.12.2)
193194
mini_magick (>= 4.9.5, < 5)
@@ -198,8 +199,8 @@ GEM
198199
railties (>= 6.0)
199200
responders (>= 2)
200201
io-console (0.7.2)
201-
irb (1.12.0)
202-
rdoc
202+
irb (1.13.1)
203+
rdoc (>= 4.0.0)
203204
reline (>= 0.4.2)
204205
jquery-rails (4.6.0)
205206
rails-dom-testing (>= 1, < 3)
@@ -218,7 +219,7 @@ GEM
218219
kaminari-core (= 1.2.2)
219220
kaminari-core (1.2.2)
220221
kgio (2.11.4)
221-
launchy (3.0.0)
222+
launchy (3.0.1)
222223
addressable (~> 2.8)
223224
childprocess (~> 5.0)
224225
letter_opener (1.10.0)
@@ -234,12 +235,13 @@ GEM
234235
marcel (1.0.4)
235236
mini_magick (4.12.0)
236237
mini_mime (1.1.5)
237-
minitest (5.22.3)
238+
mini_portile2 (2.8.7)
239+
minitest (5.23.1)
238240
msgpack (1.7.2)
239241
multi_json (1.15.0)
240242
mutex_m (0.2.0)
241243
mysql2 (0.5.6)
242-
net-imap (0.4.10)
244+
net-imap (0.4.12)
243245
date
244246
net-protocol
245247
net-pop (0.1.2)
@@ -248,8 +250,11 @@ GEM
248250
timeout
249251
net-smtp (0.5.0)
250252
net-protocol
251-
nio4r (2.7.1)
252-
nokogiri (1.16.3-x86_64-linux)
253+
nio4r (2.7.3)
254+
nokogiri (1.16.5)
255+
mini_portile2 (~> 2.8.2)
256+
racc (~> 1.4)
257+
nokogiri (1.16.5-x86_64-linux)
253258
racc (~> 1.4)
254259
nokogumbo (2.0.5)
255260
nokogiri (~> 1.8, >= 1.8.4)
@@ -258,62 +263,62 @@ GEM
258263
patron (0.13.3)
259264
psych (5.1.2)
260265
stringio
261-
public_suffix (5.0.4)
266+
public_suffix (5.0.5)
262267
puma (6.4.2)
263268
nio4r (~> 2.0)
264269
pygments.rb (1.2.1)
265270
multi_json (>= 1.0.0)
266-
racc (1.7.3)
267-
rack (3.0.10)
271+
racc (1.8.0)
272+
rack (3.0.11)
268273
rack-session (2.0.0)
269274
rack (>= 3.0.0)
270275
rack-test (2.1.0)
271276
rack (>= 1.3)
272277
rackup (2.1.0)
273278
rack (>= 3)
274279
webrick (~> 1.8)
275-
rails (7.1.3.2)
276-
actioncable (= 7.1.3.2)
277-
actionmailbox (= 7.1.3.2)
278-
actionmailer (= 7.1.3.2)
279-
actionpack (= 7.1.3.2)
280-
actiontext (= 7.1.3.2)
281-
actionview (= 7.1.3.2)
282-
activejob (= 7.1.3.2)
283-
activemodel (= 7.1.3.2)
284-
activerecord (= 7.1.3.2)
285-
activestorage (= 7.1.3.2)
286-
activesupport (= 7.1.3.2)
280+
rails (7.1.3.4)
281+
actioncable (= 7.1.3.4)
282+
actionmailbox (= 7.1.3.4)
283+
actionmailer (= 7.1.3.4)
284+
actionpack (= 7.1.3.4)
285+
actiontext (= 7.1.3.4)
286+
actionview (= 7.1.3.4)
287+
activejob (= 7.1.3.4)
288+
activemodel (= 7.1.3.4)
289+
activerecord (= 7.1.3.4)
290+
activestorage (= 7.1.3.4)
291+
activesupport (= 7.1.3.4)
287292
bundler (>= 1.15.0)
288-
railties (= 7.1.3.2)
293+
railties (= 7.1.3.4)
289294
rails-dom-testing (2.2.0)
290295
activesupport (>= 5.0.0)
291296
minitest
292297
nokogiri (>= 1.6)
293298
rails-html-sanitizer (1.6.0)
294299
loofah (~> 2.21)
295300
nokogiri (~> 1.14)
296-
railties (7.1.3.2)
297-
actionpack (= 7.1.3.2)
298-
activesupport (= 7.1.3.2)
301+
railties (7.1.3.4)
302+
actionpack (= 7.1.3.4)
303+
activesupport (= 7.1.3.4)
299304
irb
300305
rackup (>= 1.0.0)
301306
rake (>= 12.2)
302307
thor (~> 1.0, >= 1.2.2)
303308
zeitwerk (~> 2.6)
304309
raindrops (0.20.1)
305-
rake (13.1.0)
310+
rake (13.2.1)
306311
rb-fsevent (0.11.2)
307-
rb-inotify (0.10.1)
312+
rb-inotify (0.11.1)
308313
ffi (~> 1.0)
309-
rdoc (6.6.3.1)
314+
rdoc (6.7.0)
310315
psych (>= 4.0.0)
311316
redcarpet (3.6.0)
312-
redis (5.1.0)
313-
redis-client (>= 0.17.0)
314-
redis-client (0.21.1)
317+
redis (5.2.0)
318+
redis-client (>= 0.22.0)
319+
redis-client (0.22.2)
315320
connection_pool
316-
reline (0.5.0)
321+
reline (0.5.8)
317322
io-console (~> 0.5)
318323
responders (3.1.1)
319324
actionpack (>= 5.2)
@@ -340,14 +345,15 @@ GEM
340345
simplecov_json_formatter (~> 0.1)
341346
simplecov-html (0.12.3)
342347
simplecov_json_formatter (0.1.4)
343-
sitemap_generator (2.2.1)
344-
spring (4.1.3)
348+
sitemap_generator (6.3.0)
349+
builder (~> 3.0)
350+
spring (4.2.1)
345351
sprockets (4.2.1)
346352
concurrent-ruby (~> 1.0)
347353
rack (>= 2.2.4, < 4)
348-
sprockets-rails (3.4.2)
349-
actionpack (>= 5.2)
350-
activesupport (>= 5.2)
354+
sprockets-rails (3.5.1)
355+
actionpack (>= 6.1)
356+
activesupport (>= 6.1)
351357
sprockets (>= 3.0.0)
352358
ssrf_filter (1.1.2)
353359
state_machines (0.6.0)
@@ -359,7 +365,7 @@ GEM
359365
state_machines-activemodel (>= 0.9.0)
360366
stringio (3.1.0)
361367
temple (0.10.3)
362-
terser (1.2.1)
368+
terser (1.2.2)
363369
execjs (>= 0.3.0, < 3)
364370
thor (1.3.1)
365371
tilt (2.3.0)
@@ -380,9 +386,10 @@ GEM
380386
websocket-driver (0.7.6)
381387
websocket-extensions (>= 0.1.0)
382388
websocket-extensions (0.1.5)
383-
zeitwerk (2.6.13)
389+
zeitwerk (2.6.15)
384390

385391
PLATFORMS
392+
ruby
386393
x86_64-linux
387394

388395
DEPENDENCIES
@@ -423,7 +430,7 @@ DEPENDENCIES
423430
rinku (~> 2.0)
424431
sassc-rails
425432
simplecov
426-
sitemap_generator (~> 2.1)
433+
sitemap_generator
427434
spring
428435
state_machines-activerecord
429436
terser (~> 1.2)

0 commit comments

Comments
 (0)