Skip to content

Commit 7790360

Browse files
committed
Unpin connection_pool version
- May not be needed since we do not set K8=yes in the Dockerfile - Ensure this builds properly in git-sync and deploys to Rancher without error
1 parent cbda12c commit 7790360

File tree

2 files changed

+50
-63
lines changed

2 files changed

+50
-63
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,5 @@ end
6262
# Required for memcached
6363
group :production do
6464
gem "dalli"
65-
gem "connection_pool", "~> 2.4"
65+
gem "connection_pool"
6666
end

Gemfile.lock

Lines changed: 49 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,13 @@ GEM
7979
minitest (>= 5.1)
8080
securerandom (>= 0.3)
8181
tzinfo (~> 2.0, >= 2.0.5)
82-
addressable (2.8.7)
83-
public_suffix (>= 2.0.2, < 7.0)
84-
administrate (0.20.1)
85-
actionpack (>= 6.0, < 8.0)
86-
actionview (>= 6.0, < 8.0)
87-
activerecord (>= 6.0, < 8.0)
88-
jquery-rails (~> 4.6.0)
82+
addressable (2.8.8)
83+
public_suffix (>= 2.0.2, < 8.0)
84+
administrate (1.0.0)
85+
actionpack (>= 6.0, < 9.0)
86+
actionview (>= 6.0, < 9.0)
87+
activerecord (>= 6.0, < 9.0)
8988
kaminari (~> 1.2.2)
90-
sassc-rails (~> 2.1)
91-
selectize-rails (~> 0.6)
9289
ast (2.4.3)
9390
base64 (0.3.0)
9491
bcrypt (3.1.20)
@@ -99,7 +96,7 @@ GEM
9996
rouge (>= 1.0.0)
10097
bigdecimal (3.3.1)
10198
bindex (0.8.1)
102-
bootsnap (1.19.0)
99+
bootsnap (1.20.0)
103100
msgpack (~> 1.2)
104101
bootstrap (5.3.5)
105102
popper_js (>= 2.11.8, < 3)
@@ -123,7 +120,7 @@ GEM
123120
logger (~> 1.5)
124121
coderay (1.1.3)
125122
concurrent-ruby (1.3.6)
126-
connection_pool (2.5.5)
123+
connection_pool (3.0.2)
127124
coveralls (0.7.1)
128125
multi_json (~> 1.3)
129126
rest-client
@@ -158,17 +155,17 @@ GEM
158155
drb (2.2.3)
159156
erb (6.0.1)
160157
erubi (1.13.1)
161-
factory_bot (6.5.5)
158+
factory_bot (6.5.6)
162159
activesupport (>= 6.1.0)
163160
factory_bot_rails (6.5.1)
164161
factory_bot (~> 6.5)
165162
railties (>= 6.1.0)
166-
faraday (2.13.4)
163+
faraday (2.14.0)
167164
faraday-net_http (>= 2.0, < 3.5)
168165
json
169166
logger
170-
faraday-net_http (3.4.1)
171-
net-http (>= 0.5.0)
167+
faraday-net_http (3.4.2)
168+
net-http (~> 0.5)
172169
ferrum (0.17.1)
173170
addressable (~> 2.5)
174171
base64 (~> 0.2)
@@ -183,13 +180,13 @@ GEM
183180
ffi (1.17.2-x86_64-darwin)
184181
ffi (1.17.2-x86_64-linux-gnu)
185182
ffi (1.17.2-x86_64-linux-musl)
186-
globalid (1.2.1)
183+
globalid (1.3.0)
187184
activesupport (>= 6.1)
188185
hashie (5.0.0)
189186
http-accept (1.7.0)
190187
http-cookie (1.1.0)
191188
domain_name (~> 0.5)
192-
i18n (1.14.7)
189+
i18n (1.14.8)
193190
concurrent-ruby (~> 1.0)
194191
io-console (0.8.2)
195192
irb (1.16.0)
@@ -199,10 +196,6 @@ GEM
199196
jbuilder (2.14.1)
200197
actionview (>= 7.0.0)
201198
activesupport (>= 7.0.0)
202-
jquery-rails (4.6.0)
203-
rails-dom-testing (>= 1, < 3)
204-
railties (>= 4.2.0)
205-
thor (>= 0.14, < 2.0)
206199
jsbundling-rails (1.3.1)
207200
railties (>= 6.0.0)
208201
json (2.18.0)
@@ -231,15 +224,16 @@ GEM
231224
rb-fsevent (~> 0.10, >= 0.10.3)
232225
rb-inotify (~> 0.9, >= 0.9.10)
233226
logger (1.7.0)
234-
loofah (2.24.1)
227+
loofah (2.25.0)
235228
crass (~> 1.0.2)
236229
nokogiri (>= 1.12.0)
237-
mail (2.8.1)
230+
mail (2.9.0)
231+
logger
238232
mini_mime (>= 0.1.1)
239233
net-imap
240234
net-pop
241235
net-smtp
242-
marcel (1.0.4)
236+
marcel (1.1.0)
243237
matrix (0.4.3)
244238
method_source (1.1.0)
245239
mime-types (3.7.0)
@@ -251,12 +245,12 @@ GEM
251245
prism (~> 1.5)
252246
mize (0.6.1)
253247
msgpack (1.8.0)
254-
multi_json (1.17.0)
248+
multi_json (1.18.0)
255249
multi_xml (0.7.2)
256250
bigdecimal (~> 3.1)
257-
net-http (0.6.0)
258-
uri
259-
net-imap (0.5.10)
251+
net-http (0.9.1)
252+
uri (>= 0.11.1)
253+
net-imap (0.6.2)
260254
date
261255
net-protocol
262256
net-pop (0.1.2)
@@ -266,7 +260,7 @@ GEM
266260
net-smtp (0.5.1)
267261
net-protocol
268262
netrc (0.11.0)
269-
nio4r (2.7.4)
263+
nio4r (2.7.5)
270264
nokogiri (1.18.10-aarch64-linux-gnu)
271265
racc (~> 1.4)
272266
nokogiri (1.18.10-aarch64-linux-musl)
@@ -283,14 +277,14 @@ GEM
283277
racc (~> 1.4)
284278
nokogiri (1.18.10-x86_64-linux-musl)
285279
racc (~> 1.4)
286-
oauth2 (2.0.14)
280+
oauth2 (2.0.18)
287281
faraday (>= 0.17.3, < 4.0)
288282
jwt (>= 1.0, < 4.0)
289283
logger (~> 1.2)
290284
multi_xml (~> 0.5)
291285
rack (>= 1.2, < 4)
292286
snaky_hash (~> 2.0, >= 2.0.3)
293-
version_gem (~> 1.1, >= 1.1.8)
287+
version_gem (~> 1.1, >= 1.1.9)
294288
okcomputer (1.19.1)
295289
benchmark
296290
omniauth (2.1.4)
@@ -303,8 +297,8 @@ GEM
303297
oauth2 (~> 2.0)
304298
omniauth (~> 2.0)
305299
omniauth-oauth2 (~> 1.8)
306-
omniauth-oauth2 (1.8.0)
307-
oauth2 (>= 1.4, < 3)
300+
omniauth-oauth2 (1.9.0)
301+
oauth2 (>= 2.0.2, < 3)
308302
omniauth (~> 2.0)
309303
omniauth-rails_csrf_protection (2.0.1)
310304
actionpack (>= 4.2)
@@ -340,7 +334,7 @@ GEM
340334
psych (5.3.1)
341335
date
342336
stringio
343-
public_suffix (6.0.2)
337+
public_suffix (7.0.0)
344338
puma (7.1.0)
345339
nio4r (~> 2.0)
346340
racc (1.8.1)
@@ -354,7 +348,7 @@ GEM
354348
rack (>= 3.0.0)
355349
rack-test (2.2.0)
356350
rack (>= 1.3)
357-
rackup (2.2.1)
351+
rackup (2.3.1)
358352
rack (>= 3)
359353
rails (7.2.3)
360354
actioncable (= 7.2.3)
@@ -396,37 +390,39 @@ GEM
396390
rb-fsevent (0.11.2)
397391
rb-inotify (0.11.1)
398392
ffi (~> 1.0)
399-
rdoc (7.0.1)
393+
rdoc (7.0.2)
400394
erb
401395
psych (>= 4.0.0)
402396
tsort
397+
readline (0.0.4)
398+
reline
403399
regexp_parser (2.11.3)
404400
reline (0.6.3)
405401
io-console (~> 0.5)
406-
responders (3.1.1)
407-
actionpack (>= 5.2)
408-
railties (>= 5.2)
402+
responders (3.2.0)
403+
actionpack (>= 7.0)
404+
railties (>= 7.0)
409405
rest-client (2.1.0)
410406
http-accept (>= 1.7.0, < 2.0)
411407
http-cookie (>= 1.0.2, < 2.0)
412408
mime-types (>= 1.16, < 4.0)
413409
netrc (~> 0.8)
414-
rexml (3.4.2)
415-
rouge (4.6.0)
416-
rspec (3.13.1)
410+
rexml (3.4.4)
411+
rouge (4.6.1)
412+
rspec (3.13.2)
417413
rspec-core (~> 3.13.0)
418414
rspec-expectations (~> 3.13.0)
419415
rspec-mocks (~> 3.13.0)
420416
rspec-activemodel-mocks (1.3.0)
421417
activemodel (>= 3.0)
422418
activesupport (>= 3.0)
423419
rspec-mocks (>= 2.99, < 4.0)
424-
rspec-core (3.13.5)
420+
rspec-core (3.13.6)
425421
rspec-support (~> 3.13.0)
426422
rspec-expectations (3.13.5)
427423
diff-lcs (>= 1.2.0, < 2.0)
428424
rspec-support (~> 3.13.0)
429-
rspec-mocks (3.13.5)
425+
rspec-mocks (3.13.7)
430426
diff-lcs (>= 1.2.0, < 2.0)
431427
rspec-support (~> 3.13.0)
432428
rspec-rails (8.0.2)
@@ -437,7 +433,7 @@ GEM
437433
rspec-expectations (~> 3.13)
438434
rspec-mocks (~> 3.13)
439435
rspec-support (~> 3.13)
440-
rspec-support (3.13.5)
436+
rspec-support (3.13.6)
441437
rubocop (1.82.0)
442438
json (~> 2.3)
443439
language_server-protocol (~> 3.17.0.2)
@@ -452,10 +448,10 @@ GEM
452448
rubocop-ast (1.48.0)
453449
parser (>= 3.3.7.2)
454450
prism (~> 1.4)
455-
rubocop-performance (1.25.0)
451+
rubocop-performance (1.26.1)
456452
lint_roller (~> 1.1)
457453
rubocop (>= 1.75.0, < 2.0)
458-
rubocop-ast (>= 1.38.0, < 2.0)
454+
rubocop-ast (>= 1.47.1, < 2.0)
459455
rubocop-rails (2.34.2)
460456
activesupport (>= 4.2.0)
461457
lint_roller (~> 1.1)
@@ -468,16 +464,7 @@ GEM
468464
rubocop-rails (>= 2.30)
469465
ruby-progressbar (1.13.0)
470466
rubyzip (2.4.1)
471-
sassc (2.4.0)
472-
ffi (~> 1.9)
473-
sassc-rails (2.1.2)
474-
railties (>= 4.0.0)
475-
sassc (>= 2.0)
476-
sprockets (> 3.0)
477-
sprockets-rails
478-
tilt
479467
securerandom (0.4.1)
480-
selectize-rails (0.12.6)
481468
selenium-webdriver (4.10.0)
482469
rexml (~> 3.2, >= 3.2.5)
483470
rubyzip (>= 1.2.2, < 3.0)
@@ -521,11 +508,11 @@ GEM
521508
term-ansicolor (1.11.3)
522509
tins (~> 1)
523510
thor (1.4.0)
524-
tilt (2.6.1)
525-
timeout (0.4.3)
526-
tins (1.45.0)
511+
timeout (0.6.0)
512+
tins (1.51.0)
527513
bigdecimal
528514
mize (~> 0.6)
515+
readline
529516
sync
530517
tsort (0.2.0)
531518
turbo-rails (2.0.20)
@@ -550,15 +537,15 @@ GEM
550537
nokogiri (~> 1.6)
551538
rubyzip (>= 1.3.0)
552539
selenium-webdriver (~> 4.0, < 4.11)
553-
webrick (1.9.1)
540+
webrick (1.9.2)
554541
websocket (1.2.11)
555542
websocket-driver (0.8.0)
556543
base64
557544
websocket-extensions (>= 0.1.0)
558545
websocket-extensions (0.1.5)
559546
xpath (3.2.0)
560547
nokogiri (~> 1.8)
561-
zeitwerk (2.7.3)
548+
zeitwerk (2.7.4)
562549

563550
PLATFORMS
564551
aarch64-linux
@@ -580,7 +567,7 @@ DEPENDENCIES
580567
bootstrap
581568
brakeman
582569
capybara
583-
connection_pool (~> 2.4)
570+
connection_pool
584571
coveralls
585572
cssbundling-rails
586573
csv

0 commit comments

Comments
 (0)