Skip to content

Commit cb6b494

Browse files
EnochthedevEnochthedev
committed
fix: pin connection_pool ~> 2.4, add Ruby 3.4.1 version file
Rails 8.1 requires Ruby 3.4+. The connection_pool 3.x series uses anonymous rest parameters that only work in Ruby 3.4+.
1 parent afef1f4 commit cb6b494

3 files changed

Lines changed: 79 additions & 74 deletions

File tree

‎control-plane/.ruby-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.3.0
1+
3.4.1

‎control-plane/Gemfile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
source "https://rubygems.org"
22

3+
# Pin connection_pool to 2.x for Ruby 3.3 compatibility
4+
# (3.x uses Ruby 3.4+ syntax)
5+
gem "connection_pool", "~> 2.4"
6+
37
gem "rails", "~> 8.1.1"
48
gem "pg", "~> 1.1"
59
gem "puma", ">= 5.0"

‎control-plane/Gemfile.lock‎

Lines changed: 74 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -3,66 +3,66 @@ GEM
33
specs:
44
action_text-trix (2.1.16)
55
railties
6-
actioncable (8.1.1)
7-
actionpack (= 8.1.1)
8-
activesupport (= 8.1.1)
6+
actioncable (8.1.2)
7+
actionpack (= 8.1.2)
8+
activesupport (= 8.1.2)
99
nio4r (~> 2.0)
1010
websocket-driver (>= 0.6.1)
1111
zeitwerk (~> 2.6)
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)
12+
actionmailbox (8.1.2)
13+
actionpack (= 8.1.2)
14+
activejob (= 8.1.2)
15+
activerecord (= 8.1.2)
16+
activestorage (= 8.1.2)
17+
activesupport (= 8.1.2)
1818
mail (>= 2.8.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)
19+
actionmailer (8.1.2)
20+
actionpack (= 8.1.2)
21+
actionview (= 8.1.2)
22+
activejob (= 8.1.2)
23+
activesupport (= 8.1.2)
2424
mail (>= 2.8.0)
2525
rails-dom-testing (~> 2.2)
26-
actionpack (8.1.1)
27-
actionview (= 8.1.1)
28-
activesupport (= 8.1.1)
26+
actionpack (8.1.2)
27+
actionview (= 8.1.2)
28+
activesupport (= 8.1.2)
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.1)
36+
actiontext (8.1.2)
3737
action_text-trix (~> 2.1.15)
38-
actionpack (= 8.1.1)
39-
activerecord (= 8.1.1)
40-
activestorage (= 8.1.1)
41-
activesupport (= 8.1.1)
38+
actionpack (= 8.1.2)
39+
activerecord (= 8.1.2)
40+
activestorage (= 8.1.2)
41+
activesupport (= 8.1.2)
4242
globalid (>= 0.6.0)
4343
nokogiri (>= 1.8.5)
44-
actionview (8.1.1)
45-
activesupport (= 8.1.1)
44+
actionview (8.1.2)
45+
activesupport (= 8.1.2)
4646
builder (~> 3.1)
4747
erubi (~> 1.11)
4848
rails-dom-testing (~> 2.2)
4949
rails-html-sanitizer (~> 1.6)
50-
activejob (8.1.1)
51-
activesupport (= 8.1.1)
50+
activejob (8.1.2)
51+
activesupport (= 8.1.2)
5252
globalid (>= 0.3.6)
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)
53+
activemodel (8.1.2)
54+
activesupport (= 8.1.2)
55+
activerecord (8.1.2)
56+
activemodel (= 8.1.2)
57+
activesupport (= 8.1.2)
5858
timeout (>= 0.4.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)
59+
activestorage (8.1.2)
60+
actionpack (= 8.1.2)
61+
activejob (= 8.1.2)
62+
activerecord (= 8.1.2)
63+
activesupport (= 8.1.2)
6464
marcel (~> 1.0)
65-
activesupport (8.1.1)
65+
activesupport (8.1.2)
6666
base64
6767
bigdecimal
6868
concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -93,7 +93,7 @@ GEM
9393
bundler (>= 1.2.0)
9494
thor (~> 1.0)
9595
concurrent-ruby (1.3.6)
96-
connection_pool (3.0.2)
96+
connection_pool (2.5.5)
9797
crack (1.0.1)
9898
bigdecimal
9999
rexml
@@ -253,30 +253,30 @@ GEM
253253
rack (>= 1.3)
254254
rackup (2.3.1)
255255
rack (>= 3)
256-
rails (8.1.1)
257-
actioncable (= 8.1.1)
258-
actionmailbox (= 8.1.1)
259-
actionmailer (= 8.1.1)
260-
actionpack (= 8.1.1)
261-
actiontext (= 8.1.1)
262-
actionview (= 8.1.1)
263-
activejob (= 8.1.1)
264-
activemodel (= 8.1.1)
265-
activerecord (= 8.1.1)
266-
activestorage (= 8.1.1)
267-
activesupport (= 8.1.1)
256+
rails (8.1.2)
257+
actioncable (= 8.1.2)
258+
actionmailbox (= 8.1.2)
259+
actionmailer (= 8.1.2)
260+
actionpack (= 8.1.2)
261+
actiontext (= 8.1.2)
262+
actionview (= 8.1.2)
263+
activejob (= 8.1.2)
264+
activemodel (= 8.1.2)
265+
activerecord (= 8.1.2)
266+
activestorage (= 8.1.2)
267+
activesupport (= 8.1.2)
268268
bundler (>= 1.15.0)
269-
railties (= 8.1.1)
269+
railties (= 8.1.2)
270270
rails-dom-testing (2.3.0)
271271
activesupport (>= 5.0.0)
272272
minitest
273273
nokogiri (>= 1.6)
274274
rails-html-sanitizer (1.6.2)
275275
loofah (~> 2.21)
276276
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)
277-
railties (8.1.1)
278-
actionpack (= 8.1.1)
279-
activesupport (= 8.1.1)
277+
railties (8.1.2)
278+
actionpack (= 8.1.2)
279+
activesupport (= 8.1.2)
280280
irb (~> 1.13)
281281
rackup (>= 1.0.0)
282282
rake (>= 12.2)
@@ -347,12 +347,12 @@ GEM
347347
securerandom (0.4.1)
348348
shoulda-matchers (7.0.1)
349349
activesupport (>= 7.1)
350-
sidekiq (7.3.9)
350+
sidekiq (7.3.10)
351351
base64
352-
connection_pool (>= 2.3.0)
352+
connection_pool (>= 2.3.0, < 3)
353353
logger
354-
rack (>= 2.2.4)
355-
redis-client (>= 0.22.2)
354+
rack (>= 2.2.4, < 3.3)
355+
redis-client (>= 0.23.0, < 1)
356356
simplecov (0.22.0)
357357
docile (~> 1.1)
358358
simplecov-html (~> 0.11)
@@ -425,6 +425,7 @@ DEPENDENCIES
425425
bootsnap
426426
brakeman
427427
bundler-audit
428+
connection_pool (~> 2.4)
428429
database_cleaner-active_record
429430
debug
430431
dotenv
@@ -452,17 +453,17 @@ DEPENDENCIES
452453

453454
CHECKSUMS
454455
action_text-trix (2.1.16) sha256=f645a2c21821b8449fd1d6770708f4031c91a2eedf9ef476e9be93c64e703a8a
455-
actioncable (8.1.1) sha256=7262307e9693f09b299e281590110ce4b6ba7e4e4cee6da4b9d987eaf56f9139
456-
actionmailbox (8.1.1) sha256=aa99703a9b2fa32c5a4a93bb21fef79e2935d8db4d1fd5ef0772847be5d43205
457-
actionmailer (8.1.1) sha256=45755d7d4561363490ae82b17a5919bdef4dfe3bb400831819947c3a1d82afdf
458-
actionpack (8.1.1) sha256=192e27c39a63c7d801ac7b6d50505f265e389516985eed9b2ee364896a6a06d7
459-
actiontext (8.1.1) sha256=fd8d8da1e6bc0b04ff72fccfd127e78431238a99a82e736c7b52727c576a7640
460-
actionview (8.1.1) sha256=ca480c8b099dea0862b0934f24182b84c2d29092e7dbf464fb3e6d4eb9b468dc
461-
activejob (8.1.1) sha256=94f438a9f3b5a6b130fef53d8313f869dbd379309e7d639891bda36b12509383
462-
activemodel (8.1.1) sha256=8b7e2496b9e333ced06248c16a43217b950192c98e0fe3aa117eee21501c6fbd
463-
activerecord (8.1.1) sha256=e32c3a03e364fd803498eb4150c21bedc995aa83bc27122a94d480ab1dcb3d17
464-
activestorage (8.1.1) sha256=bc01d8b4c55e309a0a2e218bfe502c382c9f232e28b1f4b0adc9d8719d2bf28d
465-
activesupport (8.1.1) sha256=5e92534e8d0c8b8b5e6b16789c69dbea65c1d7b752269f71a39422e9546cea67
456+
actioncable (8.1.2) sha256=dc31efc34cca9cdefc5c691ddb8b4b214c0ea5cd1372108cbc1377767fb91969
457+
actionmailbox (8.1.2) sha256=058b2fb1980e5d5a894f675475fcfa45c62631103d5a2596d9610ec81581889b
458+
actionmailer (8.1.2) sha256=f4c1d2060f653bfe908aa7fdc5a61c0e5279670de992146582f2e36f8b9175e9
459+
actionpack (8.1.2) sha256=ced74147a1f0daafaa4bab7f677513fd4d3add574c7839958f7b4f1de44f8423
460+
actiontext (8.1.2) sha256=0bf57da22a9c19d970779c3ce24a56be31b51c7640f2763ec64aa72e358d2d2d
461+
actionview (8.1.2) sha256=80455b2588911c9b72cec22d240edacb7c150e800ef2234821269b2b2c3e2e5b
462+
activejob (8.1.2) sha256=908dab3713b101859536375819f4156b07bdf4c232cc645e7538adb9e302f825
463+
activemodel (8.1.2) sha256=e21358c11ce68aed3f9838b7e464977bc007b4446c6e4059781e1d5c03bcf33e
464+
activerecord (8.1.2) sha256=acfbe0cadfcc50fa208011fe6f4eb01cae682ebae0ef57145ba45380c74bcc44
465+
activestorage (8.1.2) sha256=8a63a48c3999caeee26a59441f813f94681fc35cc41aba7ce1f836add04fba76
466+
activesupport (8.1.2) sha256=88842578ccd0d40f658289b0e8c842acfe9af751afee2e0744a7873f50b6fdae
466467
addressable (2.8.8) sha256=7c13b8f9536cf6364c03b9d417c19986019e28f7c00ac8132da4eb0fe393b057
467468
ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383
468469
base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
@@ -476,7 +477,7 @@ CHECKSUMS
476477
builder (3.3.0) sha256=497918d2f9dca528fdca4b88d84e4ef4387256d984b8154e9d5d3fe5a9c8835f
477478
bundler-audit (0.9.3) sha256=81c8766c71e47d0d28a0f98c7eed028539f21a6ea3cd8f685eb6f42333c9b4e9
478479
concurrent-ruby (1.3.6) sha256=6b56837e1e7e5292f9864f34b69c5a2cbc75c0cf5338f1ce9903d10fa762d5ab
479-
connection_pool (3.0.2) sha256=33fff5ba71a12d2aa26cb72b1db8bba2a1a01823559fb01d29eb74c286e62e0a
480+
connection_pool (2.5.5) sha256=e54ff92855753df1fd7c59fa04a398833355f27dd14c074f8c83a05f72a716ad
480481
crack (1.0.1) sha256=ff4a10390cd31d66440b7524eb1841874db86201d5b70032028553130b6d4c7e
481482
crass (1.0.6) sha256=dc516022a56e7b3b156099abc81b6d2b08ea1ed12676ac7a5657617f012bd45d
482483
database_cleaner-active_record (2.2.2) sha256=88296b9f3088c31f7c0d4fcec10f68e4b71c96698043916de59b04debec10388
@@ -564,10 +565,10 @@ CHECKSUMS
564565
rack-session (2.1.1) sha256=0b6dc07dea7e4b583f58a48e8b806d4c9f1c6c9214ebc202ec94562cbea2e4e9
565566
rack-test (2.2.0) sha256=005a36692c306ac0b4a9350355ee080fd09ddef1148a5f8b2ac636c720f5c463
566567
rackup (2.3.1) sha256=6c79c26753778e90983761d677a48937ee3192b3ffef6bc963c0950f94688868
567-
rails (8.1.1) sha256=877509b7aef309239978685883097d2c03e21383a50a3f78882cf9b3b5c136f7
568+
rails (8.1.2) sha256=5069061b23dfa8706b9f0159ae8b9d35727359103178a26962b868a680ba7d95
568569
rails-dom-testing (2.3.0) sha256=8acc7953a7b911ca44588bf08737bc16719f431a1cc3091a292bca7317925c1d
569570
rails-html-sanitizer (1.6.2) sha256=35fce2ca8242da8775c83b6ba9c1bcaad6751d9eb73c1abaa8403475ab89a560
570-
railties (8.1.1) sha256=fb0c7038b147bea41bf6697fa443ff1c5c47d3bb1eedd9ecf1bceeb90efcb868
571+
railties (8.1.2) sha256=1289ece76b4f7668fc46d07e55cc992b5b8751f2ad85548b7da351b8c59f8055
571572
rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
572573
rake (13.3.1) sha256=8c9e89d09f66a26a01264e7e3480ec0607f0c497a861ef16063604b1b08eb19c
573574
rdoc (7.0.3) sha256=dfe3d0981d19b7bba71d9dbaeb57c9f4e3a7a4103162148a559c4fc687ea81f9
@@ -589,7 +590,7 @@ CHECKSUMS
589590
ruby-vips (2.3.0) sha256=e685ec02c13969912debbd98019e50492e12989282da5f37d05f5471442f5374
590591
securerandom (0.4.1) sha256=cc5193d414a4341b6e225f0cb4446aceca8e50d5e1888743fac16987638ea0b1
591592
shoulda-matchers (7.0.1) sha256=b4bfd8744c10e0a36c8ac1a687f921ee7e25ed529e50488d61b79a8688749c77
592-
sidekiq (7.3.9) sha256=1108712e1def89002b28e3545d5ae15d4a57ffd4d2c25d97bb1360988826b5a7
593+
sidekiq (7.3.10) sha256=781eb4f65ef36042534ad73d72f211283afb7fee82eec786ada4ed1972ef8e3c
593594
simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5
594595
simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246
595596
simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428

0 commit comments

Comments
 (0)