Skip to content

Commit 6649876

Browse files
authored
Merge pull request #1501 from alphagov/dependabot/bundler/multi-a97a16d2cf
2 parents edc3f15 + 4272b05 commit 6649876

File tree

2 files changed

+75
-73
lines changed

2 files changed

+75
-73
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source "https://rubygems.org"
22

3-
gem "rails", "~> 8.0.0"
3+
gem "rails", "~> 8.0.4"
44

55
gem "bootsnap", require: false
66
gem "dartsass-rails"

Gemfile.lock

Lines changed: 74 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,65 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (8.0.2.1)
5-
actionpack (= 8.0.2.1)
6-
activesupport (= 8.0.2.1)
4+
actioncable (8.0.4)
5+
actionpack (= 8.0.4)
6+
activesupport (= 8.0.4)
77
nio4r (~> 2.0)
88
websocket-driver (>= 0.6.1)
99
zeitwerk (~> 2.6)
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)
10+
actionmailbox (8.0.4)
11+
actionpack (= 8.0.4)
12+
activejob (= 8.0.4)
13+
activerecord (= 8.0.4)
14+
activestorage (= 8.0.4)
15+
activesupport (= 8.0.4)
1616
mail (>= 2.8.0)
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)
17+
actionmailer (8.0.4)
18+
actionpack (= 8.0.4)
19+
actionview (= 8.0.4)
20+
activejob (= 8.0.4)
21+
activesupport (= 8.0.4)
2222
mail (>= 2.8.0)
2323
rails-dom-testing (~> 2.2)
24-
actionpack (8.0.2.1)
25-
actionview (= 8.0.2.1)
26-
activesupport (= 8.0.2.1)
24+
actionpack (8.0.4)
25+
actionview (= 8.0.4)
26+
activesupport (= 8.0.4)
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.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)
34+
actiontext (8.0.4)
35+
actionpack (= 8.0.4)
36+
activerecord (= 8.0.4)
37+
activestorage (= 8.0.4)
38+
activesupport (= 8.0.4)
3939
globalid (>= 0.6.0)
4040
nokogiri (>= 1.8.5)
41-
actionview (8.0.2.1)
42-
activesupport (= 8.0.2.1)
41+
actionview (8.0.4)
42+
activesupport (= 8.0.4)
4343
builder (~> 3.1)
4444
erubi (~> 1.11)
4545
rails-dom-testing (~> 2.2)
4646
rails-html-sanitizer (~> 1.6)
47-
activejob (8.0.2.1)
48-
activesupport (= 8.0.2.1)
47+
activejob (8.0.4)
48+
activesupport (= 8.0.4)
4949
globalid (>= 0.3.6)
50-
activemodel (8.0.2.1)
51-
activesupport (= 8.0.2.1)
52-
activerecord (8.0.2.1)
53-
activemodel (= 8.0.2.1)
54-
activesupport (= 8.0.2.1)
50+
activemodel (8.0.4)
51+
activesupport (= 8.0.4)
52+
activerecord (8.0.4)
53+
activemodel (= 8.0.4)
54+
activesupport (= 8.0.4)
5555
timeout (>= 0.4.0)
56-
activestorage (8.0.2.1)
57-
actionpack (= 8.0.2.1)
58-
activejob (= 8.0.2.1)
59-
activerecord (= 8.0.2.1)
60-
activesupport (= 8.0.2.1)
56+
activestorage (8.0.4)
57+
actionpack (= 8.0.4)
58+
activejob (= 8.0.4)
59+
activerecord (= 8.0.4)
60+
activesupport (= 8.0.4)
6161
marcel (~> 1.0)
62-
activesupport (8.0.2.1)
62+
activesupport (8.0.4)
6363
base64
6464
benchmark (>= 0.3)
6565
bigdecimal
@@ -101,7 +101,7 @@ GEM
101101
xpath (~> 3.2)
102102
chronic (0.10.2)
103103
concurrent-ruby (1.3.5)
104-
connection_pool (3.0.2)
104+
connection_pool (2.5.5)
105105
crack (1.0.1)
106106
bigdecimal
107107
rexml
@@ -173,10 +173,11 @@ GEM
173173
jquery-rails (~> 4.3)
174174
plek (>= 2.1)
175175
rails (>= 6)
176-
govuk_app_config (9.22.2)
176+
govuk_app_config (9.22.3)
177+
connection_pool (< 3)
177178
logstasher (~> 2.1)
178179
opentelemetry-exporter-otlp (>= 0.25, < 0.32)
179-
opentelemetry-instrumentation-all (>= 0.39.1, < 0.89.0)
180+
opentelemetry-instrumentation-all (>= 0.39.1, < 0.90.0)
180181
opentelemetry-sdk (~> 1.2)
181182
plek (>= 4, < 6)
182183
prometheus_exporter (~> 2.3)
@@ -334,7 +335,7 @@ GEM
334335
opentelemetry-common (~> 0.21)
335336
opentelemetry-helpers-sql (0.3.0)
336337
opentelemetry-api (~> 1.7)
337-
opentelemetry-helpers-sql-obfuscation (0.5.0)
338+
opentelemetry-helpers-sql-processor (0.3.1)
338339
opentelemetry-common (~> 0.21)
339340
opentelemetry-instrumentation-action_mailer (0.6.1)
340341
opentelemetry-instrumentation-active_support (~> 0.10)
@@ -352,7 +353,7 @@ GEM
352353
opentelemetry-instrumentation-active_support (~> 0.10)
353354
opentelemetry-instrumentation-active_support (0.10.1)
354355
opentelemetry-instrumentation-base (~> 0.25)
355-
opentelemetry-instrumentation-all (0.88.0)
356+
opentelemetry-instrumentation-all (0.89.1)
356357
opentelemetry-instrumentation-active_model_serializers (~> 0.24.0)
357358
opentelemetry-instrumentation-anthropic (~> 0.3.0)
358359
opentelemetry-instrumentation-aws_lambda (~> 0.6.0)
@@ -374,10 +375,10 @@ GEM
374375
opentelemetry-instrumentation-koala (~> 0.23.0)
375376
opentelemetry-instrumentation-lmdb (~> 0.25.0)
376377
opentelemetry-instrumentation-mongo (~> 0.25.0)
377-
opentelemetry-instrumentation-mysql2 (~> 0.31.0)
378+
opentelemetry-instrumentation-mysql2 (~> 0.32.1)
378379
opentelemetry-instrumentation-net_http (~> 0.26.0)
379-
opentelemetry-instrumentation-pg (~> 0.33.0)
380-
opentelemetry-instrumentation-que (~> 0.11.1)
380+
opentelemetry-instrumentation-pg (~> 0.34.1)
381+
opentelemetry-instrumentation-que (~> 0.12.0)
381382
opentelemetry-instrumentation-racecar (~> 0.6.0)
382383
opentelemetry-instrumentation-rack (~> 0.29.0)
383384
opentelemetry-instrumentation-rails (~> 0.39.1)
@@ -387,9 +388,9 @@ GEM
387388
opentelemetry-instrumentation-resque (~> 0.8.0)
388389
opentelemetry-instrumentation-restclient (~> 0.26.0)
389390
opentelemetry-instrumentation-ruby_kafka (~> 0.24.0)
390-
opentelemetry-instrumentation-sidekiq (~> 0.28.0)
391+
opentelemetry-instrumentation-sidekiq (~> 0.28.1)
391392
opentelemetry-instrumentation-sinatra (~> 0.28.0)
392-
opentelemetry-instrumentation-trilogy (~> 0.64.0)
393+
opentelemetry-instrumentation-trilogy (~> 0.65.1)
393394
opentelemetry-instrumentation-anthropic (0.3.0)
394395
opentelemetry-instrumentation-base (~> 0.25)
395396
opentelemetry-instrumentation-aws_lambda (0.6.0)
@@ -434,18 +435,18 @@ GEM
434435
opentelemetry-instrumentation-base (~> 0.25)
435436
opentelemetry-instrumentation-mongo (0.25.0)
436437
opentelemetry-instrumentation-base (~> 0.25)
437-
opentelemetry-instrumentation-mysql2 (0.31.0)
438+
opentelemetry-instrumentation-mysql2 (0.32.1)
438439
opentelemetry-helpers-mysql
439440
opentelemetry-helpers-sql
440-
opentelemetry-helpers-sql-obfuscation
441+
opentelemetry-helpers-sql-processor
441442
opentelemetry-instrumentation-base (~> 0.25)
442443
opentelemetry-instrumentation-net_http (0.26.1)
443444
opentelemetry-instrumentation-base (~> 0.25)
444-
opentelemetry-instrumentation-pg (0.33.0)
445+
opentelemetry-instrumentation-pg (0.34.1)
445446
opentelemetry-helpers-sql
446-
opentelemetry-helpers-sql-obfuscation
447+
opentelemetry-helpers-sql-processor
447448
opentelemetry-instrumentation-base (~> 0.25)
448-
opentelemetry-instrumentation-que (0.11.1)
449+
opentelemetry-instrumentation-que (0.12.0)
449450
opentelemetry-instrumentation-base (~> 0.25)
450451
opentelemetry-instrumentation-racecar (0.6.0)
451452
opentelemetry-instrumentation-base (~> 0.25)
@@ -476,10 +477,10 @@ GEM
476477
opentelemetry-instrumentation-base (~> 0.25)
477478
opentelemetry-instrumentation-sinatra (0.28.0)
478479
opentelemetry-instrumentation-rack (~> 0.29)
479-
opentelemetry-instrumentation-trilogy (0.64.0)
480+
opentelemetry-instrumentation-trilogy (0.65.1)
480481
opentelemetry-helpers-mysql
481482
opentelemetry-helpers-sql
482-
opentelemetry-helpers-sql-obfuscation
483+
opentelemetry-helpers-sql-processor
483484
opentelemetry-instrumentation-base (~> 0.25)
484485
opentelemetry-semantic_conventions (>= 1.8.0)
485486
opentelemetry-registry (0.4.0)
@@ -524,20 +525,20 @@ GEM
524525
rack (>= 1.3)
525526
rackup (2.3.1)
526527
rack (>= 3)
527-
rails (8.0.2.1)
528-
actioncable (= 8.0.2.1)
529-
actionmailbox (= 8.0.2.1)
530-
actionmailer (= 8.0.2.1)
531-
actionpack (= 8.0.2.1)
532-
actiontext (= 8.0.2.1)
533-
actionview (= 8.0.2.1)
534-
activejob (= 8.0.2.1)
535-
activemodel (= 8.0.2.1)
536-
activerecord (= 8.0.2.1)
537-
activestorage (= 8.0.2.1)
538-
activesupport (= 8.0.2.1)
528+
rails (8.0.4)
529+
actioncable (= 8.0.4)
530+
actionmailbox (= 8.0.4)
531+
actionmailer (= 8.0.4)
532+
actionpack (= 8.0.4)
533+
actiontext (= 8.0.4)
534+
actionview (= 8.0.4)
535+
activejob (= 8.0.4)
536+
activemodel (= 8.0.4)
537+
activerecord (= 8.0.4)
538+
activestorage (= 8.0.4)
539+
activesupport (= 8.0.4)
539540
bundler (>= 1.15.0)
540-
railties (= 8.0.2.1)
541+
railties (= 8.0.4)
541542
rails-controller-testing (1.0.5)
542543
actionpack (>= 5.0.1.rc1)
543544
actionview (>= 5.0.1.rc1)
@@ -549,13 +550,14 @@ GEM
549550
rails-html-sanitizer (1.6.2)
550551
loofah (~> 2.21)
551552
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)
552-
railties (8.0.2.1)
553-
actionpack (= 8.0.2.1)
554-
activesupport (= 8.0.2.1)
553+
railties (8.0.4)
554+
actionpack (= 8.0.4)
555+
activesupport (= 8.0.4)
555556
irb (~> 1.13)
556557
rackup (>= 1.0.0)
557558
rake (>= 12.2)
558559
thor (~> 1.0, >= 1.2.2)
560+
tsort (>= 0.2)
559561
zeitwerk (~> 2.6)
560562
rainbow (3.1.1)
561563
rake (13.3.1)
@@ -686,7 +688,7 @@ GEM
686688
terser (1.2.6)
687689
execjs (>= 0.3.0, < 3)
688690
thor (1.4.0)
689-
timeout (0.4.4)
691+
timeout (0.5.0)
690692
tsort (0.2.0)
691693
tzinfo (2.0.6)
692694
concurrent-ruby (~> 1.0)
@@ -746,7 +748,7 @@ DEPENDENCIES
746748
mlanett-redis-lock
747749
mongoid
748750
plek
749-
rails (~> 8.0.0)
751+
rails (~> 8.0.4)
750752
rails-controller-testing
751753
redis
752754
rspec-rails

0 commit comments

Comments
 (0)