Skip to content

Commit 169dff3

Browse files
authored
Merge branch 'main' into dependabot/bundler/blazer-3.2.1
2 parents c768dcf + 352acb5 commit 169dff3

File tree

2 files changed

+45
-38
lines changed

2 files changed

+45
-38
lines changed

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ gem 'sqlite3', '~> 1.7'
1515
gem 'pg'
1616

1717
# Use the Puma web server [https://github.com/puma/puma]
18-
gem 'puma', '~> 6.5'
18+
gem 'puma', '~> 6.6'
1919

2020
# Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails]
2121
gem 'importmap-rails'
@@ -30,7 +30,7 @@ gem 'stimulus-rails'
3030
gem 'jbuilder'
3131

3232
# Use Redis adapter to run Action Cable in production
33-
gem 'redis', '~> 5.3'
33+
gem 'redis', '~> 5.4'
3434

3535
# Use Kredis to get higher-level data types in Redis [https://github.com/rails/kredis]
3636
# gem "kredis"

Gemfile.lock

Lines changed: 43 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ GEM
7070
public_suffix (>= 2.0.2, < 6.0)
7171
appsignal (3.7.5)
7272
rack
73-
ast (2.4.2)
73+
ast (2.4.3)
7474
base64 (0.2.0)
7575
bcrypt (3.1.20)
76-
bigdecimal (3.1.8)
76+
bigdecimal (3.1.9)
7777
bindex (0.8.1)
7878
blazer (3.2.1)
7979
activerecord (>= 7)
@@ -84,7 +84,7 @@ GEM
8484
bootsnap (1.18.4)
8585
msgpack (~> 1.2)
8686
builder (3.3.0)
87-
byebug (11.1.3)
87+
byebug (12.0.0)
8888
capybara (3.40.0)
8989
addressable
9090
matrix
@@ -95,11 +95,11 @@ GEM
9595
regexp_parser (>= 1.5, < 3.0)
9696
xpath (~> 3.2)
9797
chartkick (5.1.2)
98-
concurrent-ruby (1.3.5)
99-
connection_pool (2.4.1)
98+
concurrent-ruby (1.3.4)
99+
connection_pool (2.5.3)
100100
crass (1.0.6)
101-
csv (3.3.3)
102-
date (3.4.0)
101+
csv (3.3.0)
102+
date (3.4.1)
103103
debug (1.10.0)
104104
irb (~> 1.10)
105105
reline (>= 0.3.8)
@@ -119,15 +119,17 @@ GEM
119119
dry-configurable (1.2.0)
120120
dry-core (~> 1.0, < 2)
121121
zeitwerk (~> 2.6)
122-
dry-core (1.0.1)
122+
dry-core (1.1.0)
123123
concurrent-ruby (~> 1.0)
124+
logger
124125
zeitwerk (~> 2.6)
125-
dry-inflector (1.1.0)
126-
dry-logic (1.5.0)
126+
dry-inflector (1.2.0)
127+
dry-logic (1.6.0)
128+
bigdecimal
127129
concurrent-ruby (~> 1.0)
128-
dry-core (~> 1.0, < 2)
130+
dry-core (~> 1.1)
129131
zeitwerk (~> 2.6)
130-
dry-types (1.7.2)
132+
dry-types (1.8.0)
131133
bigdecimal (~> 3.0)
132134
concurrent-ruby (~> 1.0)
133135
dry-core (~> 1.0)
@@ -153,7 +155,7 @@ GEM
153155
mustermann-grape (~> 1.1.0)
154156
rack (>= 2)
155157
zeitwerk
156-
grape-swagger (2.1.1)
158+
grape-swagger (2.1.2)
157159
grape (>= 1.7, < 3.0)
158160
rack-test (~> 2)
159161
grape_logging (1.8.4)
@@ -192,11 +194,13 @@ GEM
192194
rails-dom-testing (>= 1, < 3)
193195
railties (>= 4.2.0)
194196
thor (>= 0.14, < 2.0)
195-
json (2.9.0)
197+
json (2.11.3)
196198
jwt (2.8.2)
197199
base64
198-
language_server-protocol (3.17.0.3)
199-
loofah (2.24.0)
200+
language_server-protocol (3.17.0.4)
201+
lint_roller (1.1.0)
202+
logger (1.6.4)
203+
loofah (2.23.1)
200204
crass (~> 1.0.2)
201205
nokogiri (>= 1.12.0)
202206
mail (2.8.1)
@@ -208,14 +212,14 @@ GEM
208212
matrix (0.4.2)
209213
method_source (1.1.0)
210214
mini_mime (1.1.5)
211-
mini_portile2 (2.8.8)
212-
minitest (5.25.5)
215+
mini_portile2 (2.8.9)
216+
minitest (5.25.4)
213217
msgpack (1.7.2)
214218
mustermann (3.0.3)
215219
ruby2_keywords (~> 0.0.1)
216220
mustermann-grape (1.1.0)
217221
mustermann (>= 1.0.0)
218-
net-imap (0.5.1)
222+
net-imap (0.5.7)
219223
date
220224
net-protocol
221225
net-pop (0.1.2)
@@ -225,23 +229,24 @@ GEM
225229
net-smtp (0.5.0)
226230
net-protocol
227231
nio4r (2.7.4)
228-
nokogiri (1.18.5)
232+
nokogiri (1.18.9)
229233
mini_portile2 (~> 2.8.2)
230234
racc (~> 1.4)
231235
orm_adapter (0.5.0)
232-
parallel (1.26.3)
233-
parser (3.3.6.0)
236+
parallel (1.27.0)
237+
parser (3.3.8.0)
234238
ast (~> 2.4.1)
235239
racc
236240
pg (1.5.9)
241+
prism (1.4.0)
237242
psych (5.2.2)
238243
date
239244
stringio
240245
public_suffix (5.0.4)
241-
puma (6.5.0)
246+
puma (6.6.0)
242247
nio4r (~> 2.0)
243248
racc (1.8.1)
244-
rack (2.2.13)
249+
rack (2.2.14)
245250
rack-cors (2.0.2)
246251
rack (>= 2.0.0)
247252
rack-test (2.2.0)
@@ -278,11 +283,11 @@ GEM
278283
rake (13.2.1)
279284
rdoc (6.10.0)
280285
psych (>= 4.0.0)
281-
redis (5.3.0)
286+
redis (5.4.0)
282287
redis-client (>= 0.22.0)
283-
redis-client (0.22.2)
288+
redis-client (0.24.0)
284289
connection_pool
285-
regexp_parser (2.9.3)
290+
regexp_parser (2.10.0)
286291
reline (0.6.0)
287292
io-console (~> 0.5)
288293
responders (3.1.1)
@@ -306,18 +311,20 @@ GEM
306311
rspec-mocks (~> 3.13)
307312
rspec-support (~> 3.13)
308313
rspec-support (3.13.2)
309-
rubocop (1.69.2)
314+
rubocop (1.75.5)
310315
json (~> 2.3)
311-
language_server-protocol (>= 3.17.0)
316+
language_server-protocol (~> 3.17.0.2)
317+
lint_roller (~> 1.1.0)
312318
parallel (~> 1.10)
313319
parser (>= 3.3.0.2)
314320
rainbow (>= 2.2.2, < 4.0)
315321
regexp_parser (>= 2.9.3, < 3.0)
316-
rubocop-ast (>= 1.36.2, < 2.0)
322+
rubocop-ast (>= 1.44.0, < 2.0)
317323
ruby-progressbar (~> 1.7)
318324
unicode-display_width (>= 2.4.0, < 4.0)
319-
rubocop-ast (1.36.2)
320-
parser (>= 3.3.1.0)
325+
rubocop-ast (1.44.1)
326+
parser (>= 3.3.7.2)
327+
prism (~> 1.4)
321328
rubocop-rails (2.27.0)
322329
activesupport (>= 4.2.0)
323330
rack (>= 1.1)
@@ -349,13 +356,13 @@ GEM
349356
temple (0.10.3)
350357
thor (1.3.2)
351358
tilt (2.3.0)
352-
timeout (0.4.2)
359+
timeout (0.4.3)
353360
turbo-rails (2.0.11)
354361
actionpack (>= 6.0.0)
355362
railties (>= 6.0.0)
356363
tzinfo (2.0.6)
357364
concurrent-ruby (~> 1.0)
358-
unicode-display_width (3.1.2)
365+
unicode-display_width (3.1.4)
359366
unicode-emoji (~> 4.0, >= 4.0.4)
360367
unicode-emoji (4.0.4)
361368
warden (1.2.9)
@@ -408,10 +415,10 @@ DEPENDENCIES
408415
jbuilder
409416
jquery-rails
410417
pg
411-
puma (~> 6.5)
418+
puma (~> 6.6)
412419
rack-cors
413420
rails (~> 7.0.8)
414-
redis (~> 5.3)
421+
redis (~> 5.4)
415422
rspec-rails
416423
rubocop
417424
rubocop-rails

0 commit comments

Comments
 (0)