Skip to content

Commit 2e5e658

Browse files
authored
Merge pull request #798 from ecosyste-ms/lock-connection-pool
lock connection_pool to 2.5.5
2 parents 69fe983 + da8c729 commit 2e5e658

File tree

3 files changed

+20
-23
lines changed

3 files changed

+20
-23
lines changed

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ gem 'appsignal'
4646
gem 'commonmarker'
4747
gem 'ostruct'
4848
gem 'dalli'
49+
gem "connection_pool", "<3"
4950

5051
group :development, :test do
5152
gem 'dotenv-rails'

Gemfile.lock

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@ GEM
5656
language_list (~> 1.2.1)
5757
chronic_duration (0.10.6)
5858
numerizer (~> 0.1.1)
59-
commonmarker (2.5.0)
60-
rb_sys (~> 0.9)
61-
commonmarker (2.5.0-aarch64-linux)
62-
commonmarker (2.5.0-aarch64-linux-musl)
63-
commonmarker (2.5.0-x86_64-linux)
64-
commonmarker (2.5.0-x86_64-linux-musl)
59+
commonmarker (2.6.0-aarch64-linux)
60+
commonmarker (2.6.0-aarch64-linux-musl)
61+
commonmarker (2.6.0-arm64-darwin)
62+
commonmarker (2.6.0-x86_64-darwin)
63+
commonmarker (2.6.0-x86_64-linux)
64+
commonmarker (2.6.0-x86_64-linux-musl)
6565
concurrent-ruby (1.3.5)
66-
connection_pool (3.0.2)
66+
connection_pool (2.5.5)
6767
counter_culture (3.11.4)
6868
activerecord (>= 4.2)
6969
activesupport (>= 4.2)
@@ -142,7 +142,7 @@ GEM
142142
rails-dom-testing (>= 1, < 3)
143143
railties (>= 4.2.0)
144144
thor (>= 0.14, < 2.0)
145-
json (2.17.1)
145+
json (2.18.0)
146146
json_schema (0.20.9)
147147
language_list (1.2.1)
148148
logger (1.7.0)
@@ -233,9 +233,6 @@ GEM
233233
tsort (>= 0.2)
234234
zeitwerk (~> 2.6)
235235
rake (13.3.1)
236-
rake-compiler-dock (1.10.0)
237-
rb_sys (0.9.119)
238-
rake-compiler-dock (= 1.10.0)
239236
rdoc (6.17.0)
240237
erb
241238
psych (>= 4.0.0)
@@ -339,6 +336,7 @@ DEPENDENCIES
339336
bootstrap-icons
340337
cff
341338
commonmarker
339+
connection_pool (< 3)
342340
counter_culture
343341
csv
344342
dalli
@@ -396,13 +394,14 @@ CHECKSUMS
396394
builder (3.3.0) sha256=497918d2f9dca528fdca4b88d84e4ef4387256d984b8154e9d5d3fe5a9c8835f
397395
cff (1.3.0) sha256=d2b65d57160040ad244087d65b89769558a40aafb34b13d048e0ea72bc521316
398396
chronic_duration (0.10.6) sha256=fac58d4147d3183a40811400380cafcef049f2bb02421d2fd1c6e685fbe8facc
399-
commonmarker (2.5.0) sha256=fc84f9e01b271298691a7cfc298cbbaadb893395dc92e9b51644675abff248b5
400-
commonmarker (2.5.0-aarch64-linux) sha256=5812585cbd6081483331a750b0227cd0b6d951b76103bab10ee116aa58d7e526
401-
commonmarker (2.5.0-aarch64-linux-musl) sha256=b72636814379033e20d77433f8a0df6c3446fbd9557ba029445d59c53cd693af
402-
commonmarker (2.5.0-x86_64-linux) sha256=9b0d79a883a5df132291c181253cbe31254e6c5c6f131dc7e7a321f872b10db9
403-
commonmarker (2.5.0-x86_64-linux-musl) sha256=3ac20d8de38260d02306e3a539b90d136818998bcfb203114f7054ad7fdb7b37
397+
commonmarker (2.6.0-aarch64-linux) sha256=41038a1d4ffe5ac71a2bfbcb9bb2ba569fff6a2b410cecc7cded1a679497cb76
398+
commonmarker (2.6.0-aarch64-linux-musl) sha256=4b1c1f27e7e433776f0811b29a1380bff00be343ebcf97cbf5d5e407a19c08ba
399+
commonmarker (2.6.0-arm64-darwin) sha256=1e154955c5e32735bec7d5779e0fb1d21e55f46bcfcd43399ec1cbfc105030a0
400+
commonmarker (2.6.0-x86_64-darwin) sha256=4e139f919fc761147263c7e0a19750c0fe3717e577e7e1b793e6cdb7596c4f94
401+
commonmarker (2.6.0-x86_64-linux) sha256=cddae70929aea45c6a8aa72bfc02d15029611b0e88fee965d0151bc9453fd8bb
402+
commonmarker (2.6.0-x86_64-linux-musl) sha256=10159e84446362daa92380f0f68fd3818affa86527f0f098d0d08ac49941538e
404403
concurrent-ruby (1.3.5) sha256=813b3e37aca6df2a21a3b9f1d497f8cbab24a2b94cab325bffe65ee0f6cbebc6
405-
connection_pool (3.0.2) sha256=33fff5ba71a12d2aa26cb72b1db8bba2a1a01823559fb01d29eb74c286e62e0a
404+
connection_pool (2.5.5) sha256=e54ff92855753df1fd7c59fa04a398833355f27dd14c074f8c83a05f72a716ad
406405
counter_culture (3.11.4) sha256=af64b6e429a2755057a7162826ea68ae354b869506199a6f521d171765c2ca38
407406
crack (1.0.1) sha256=ff4a10390cd31d66440b7524eb1841874db86201d5b70032028553130b6d4c7e
408407
crass (1.0.6) sha256=dc516022a56e7b3b156099abc81b6d2b08ea1ed12676ac7a5657617f012bd45d
@@ -440,7 +439,7 @@ CHECKSUMS
440439
irb (1.15.3) sha256=4349edff1efa7ff7bfd34cb9df74a133a588ba88c2718098b3b4468b81184aaa
441440
jbuilder (2.14.1) sha256=4eb26376ff60ef100cb4fd6fd7533cd271f9998327e86adf20fd8c0e69fabb42
442441
jquery-rails (4.6.1) sha256=619f3496cdcdeaae1fd6dafa52dbac3fc45b745d4e09712da4184a16b3a8d9c0
443-
json (2.17.1) sha256=e0e4824541336a44915436f53e7ea74c687314fb8f88080fa1456f6a34ead92e
442+
json (2.18.0) sha256=b10506aee4183f5cf49e0efc48073d7b75843ce3782c68dbeb763351c08fd505
444443
json_schema (0.20.9) sha256=2ccb9054df9cdbb9b46c89fd7be482108811e080ee32ccef59047d7b2a3dae1d
445444
language_list (1.2.1) sha256=bc7e4297c477555f830220604baea8c0ee8480075c7fac68f57a671d287286bc
446445
logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
@@ -489,8 +488,6 @@ CHECKSUMS
489488
rails-html-sanitizer (1.6.2) sha256=35fce2ca8242da8775c83b6ba9c1bcaad6751d9eb73c1abaa8403475ab89a560
490489
railties (8.1.1) sha256=fb0c7038b147bea41bf6697fa443ff1c5c47d3bb1eedd9ecf1bceeb90efcb868
491490
rake (13.3.1) sha256=8c9e89d09f66a26a01264e7e3480ec0607f0c497a861ef16063604b1b08eb19c
492-
rake-compiler-dock (1.10.0) sha256=dd62ee19df2a185a3315697e560cfa8cc9129901332152851e023fab0e94bf11
493-
rb_sys (0.9.119) sha256=64393fa148e402e1b79b64496d2aabfc7df79da6b822b8bb48dc1141eaf40b4b
494491
rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7
495492
redis (5.4.1) sha256=b5e675b57ad22b15c9bcc765d5ac26f60b675408af916d31527af9bd5a81faae
496493
redis-client (0.26.2) sha256=1336fb5a7202d398b719531853c184b7c9cbdcace1f00f8356062b9dfba6779b
@@ -527,7 +524,7 @@ CHECKSUMS
527524
zeitwerk (2.7.3) sha256=b2e86b4a9b57d26ba68a15230dcc7fe6f040f06831ce64417b0621ad96ba3e85
528525

529526
RUBY VERSION
530-
ruby 3.4.7p58
527+
ruby 3.4.7
531528

532529
BUNDLED WITH
533-
2.7.2
530+
4.0.1

config/application.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,5 @@ class Application < Rails::Application
2424
# config.time_zone = "Central Time (US & Canada)"
2525
# config.eager_load_paths << Rails.root.join("extras")
2626
config.exceptions_app = self.routes
27-
config.active_support.to_time_preserves_timezone = :zone
2827
end
2928
end

0 commit comments

Comments
 (0)