Skip to content

Commit 6baaabc

Browse files
committed
Pin connection_pool to <3
To work around mperham/connection_pool#212
1 parent 5fb40db commit 6baaabc

2 files changed

Lines changed: 11 additions & 38 deletions

File tree

Gemfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,9 @@ gem 'sprockets-rails'
218218
# for multiple speakers select on proposal/event forms
219219
gem 'selectize-rails'
220220

221+
# Pin to solve https://github.com/mperham/connection_pool/issues/212
222+
gem "connection_pool", "< 3"
223+
221224
# memcached binary connector
222225
gem 'dalli'
223226

Gemfile.lock

Lines changed: 8 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ GEM
182182
ostruct
183183
cocoon (1.2.15)
184184
concurrent-ruby (1.3.6)
185-
connection_pool (3.0.2)
185+
connection_pool (2.5.5)
186186
countable-rails (0.0.1)
187187
railties (>= 3.1)
188188
crack (1.0.1)
@@ -245,14 +245,7 @@ GEM
245245
net-http (~> 0.5)
246246
fastimage (2.4.1)
247247
feature (1.4.0)
248-
ffi (1.17.3-aarch64-linux-gnu)
249-
ffi (1.17.3-aarch64-linux-musl)
250-
ffi (1.17.3-arm-linux-gnu)
251-
ffi (1.17.3-arm-linux-musl)
252-
ffi (1.17.3-arm64-darwin)
253-
ffi (1.17.3-x86_64-darwin)
254-
ffi (1.17.3-x86_64-linux-gnu)
255-
ffi (1.17.3-x86_64-linux-musl)
248+
ffi (1.17.3)
256249
font-awesome-sass (6.7.2)
257250
sassc (~> 2.0)
258251
geckodriver-helper (0.24.0)
@@ -358,6 +351,7 @@ GEM
358351
mini_magick (5.3.1)
359352
logger
360353
mini_mime (1.1.5)
354+
mini_portile2 (2.8.9)
361355
minitest (6.0.2)
362356
drb (~> 2.0)
363357
prism (~> 1.5)
@@ -393,21 +387,8 @@ GEM
393387
next_rails (1.4.6)
394388
rainbow (>= 3)
395389
nio4r (2.7.5)
396-
nokogiri (1.19.1-aarch64-linux-gnu)
397-
racc (~> 1.4)
398-
nokogiri (1.19.1-aarch64-linux-musl)
399-
racc (~> 1.4)
400-
nokogiri (1.19.1-arm-linux-gnu)
401-
racc (~> 1.4)
402-
nokogiri (1.19.1-arm-linux-musl)
403-
racc (~> 1.4)
404-
nokogiri (1.19.1-arm64-darwin)
405-
racc (~> 1.4)
406-
nokogiri (1.19.1-x86_64-darwin)
407-
racc (~> 1.4)
408-
nokogiri (1.19.1-x86_64-linux-gnu)
409-
racc (~> 1.4)
410-
nokogiri (1.19.1-x86_64-linux-musl)
390+
nokogiri (1.19.1)
391+
mini_portile2 (~> 2.8.2)
411392
racc (~> 1.4)
412393
oauth2 (2.0.18)
413394
faraday (>= 0.17.3, < 4.0)
@@ -463,12 +444,6 @@ GEM
463444
ruby-rc4
464445
ttfunk
465446
pg (1.6.3)
466-
pg (1.6.3-aarch64-linux)
467-
pg (1.6.3-aarch64-linux-musl)
468-
pg (1.6.3-arm64-darwin)
469-
pg (1.6.3-x86_64-darwin)
470-
pg (1.6.3-x86_64-linux)
471-
pg (1.6.3-x86_64-linux-musl)
472447
pp (0.6.3)
473448
prettyprint
474449
prawn (2.4.0)
@@ -674,14 +649,8 @@ GEM
674649
actionpack (>= 6.1)
675650
activesupport (>= 6.1)
676651
sprockets (>= 3.0.0)
677-
sqlite3 (2.9.1-aarch64-linux-gnu)
678-
sqlite3 (2.9.1-aarch64-linux-musl)
679-
sqlite3 (2.9.1-arm-linux-gnu)
680-
sqlite3 (2.9.1-arm-linux-musl)
681-
sqlite3 (2.9.1-arm64-darwin)
682-
sqlite3 (2.9.1-x86_64-darwin)
683-
sqlite3 (2.9.1-x86_64-linux-gnu)
684-
sqlite3 (2.9.1-x86_64-linux-musl)
652+
sqlite3 (2.9.1)
653+
mini_portile2 (~> 2.8.0)
685654
ssrf_filter (1.3.0)
686655
stringio (3.2.0)
687656
stripe (5.55.0)
@@ -761,6 +730,7 @@ DEPENDENCIES
761730
climate_control
762731
cloudinary
763732
cocoon
733+
connection_pool (< 3)
764734
countable-rails
765735
daemons
766736
dalli

0 commit comments

Comments
 (0)