Skip to content

Commit 3aeb048

Browse files
authored
Merge pull request #1873 from codetriage/schneems/update-ruby
Update Ruby + bundler + puma + barnes
2 parents 8d8b839 + 01488e1 commit 3aeb048

5 files changed

Lines changed: 12 additions & 14 deletions

File tree

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0.3
1+
4.0.5

.vscode/settings.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"rubyLsp.formatter": "standard",
3+
"rubyLsp.linters": ["standard"]
4+
}

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ gem "rails", "8.1.2"
1111
gem "git_hub_bub"
1212

1313
# Application server & middleware
14-
gem "puma", "7.2.0"
14+
gem "puma"
1515
gem "puma_worker_killer"
1616
gem "rack-timeout"
1717
gem "rack-canonical-host"

Gemfile.lock

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ GEM
382382
date
383383
stringio
384384
public_suffix (7.0.2)
385-
puma (7.2.0)
385+
puma (8.0.1)
386386
nio4r (~> 2.0)
387387
puma_worker_killer (1.0.0)
388388
bigdecimal (>= 2.0)
@@ -667,7 +667,7 @@ DEPENDENCIES
667667
prawn
668668
premailer-rails
669669
pry
670-
puma (= 7.2.0)
670+
puma
671671
puma_worker_killer
672672
rack-canonical-host
673673
rack-mini-profiler
@@ -740,6 +740,7 @@ CHECKSUMS
740740
bootsnap (1.23.0) sha256=c1254f458d58558b58be0f8eb8f6eec2821456785b7cdd1e16248e2020d3f214
741741
bourbon (7.3.0) sha256=8a150f97d574ef13d4b50a1c936e5059efe2ae2483de13a7f265e5129c6f98b7
742742
builder (3.3.0) sha256=497918d2f9dca528fdca4b88d84e4ef4387256d984b8154e9d5d3fe5a9c8835f
743+
bundler (4.0.12) sha256=7f8b757d28dfb636e7b24fba2344ac6dd13b5b24f4b46d62573d483f211825ac
743744
capybara (3.40.0) sha256=42dba720578ea1ca65fd7a41d163dd368502c191804558f6e0f71b391054aeef
744745
childprocess (5.1.0) sha256=9a8d484be2fd4096a0e90a0cd3e449a05bc3aa33f8ac9e4d6dcef6ac1455b6ec
745746
coderay (1.1.3) sha256=dc530018a4684512f8f38143cd2a096c9f02a1fc2459edcfe534787a7fc77d4b
@@ -862,7 +863,7 @@ CHECKSUMS
862863
pry (0.16.0) sha256=d76c69065698ed1f85e717bd33d7942c38a50868f6b0673c636192b3d1b6054e
863864
psych (5.3.1) sha256=eb7a57cef10c9d70173ff74e739d843ac3b2c019a003de48447b2963d81b1974
864865
public_suffix (7.0.2) sha256=9114090c8e4e7135c1fd0e7acfea33afaab38101884320c65aaa0ffb8e26a857
865-
puma (7.2.0) sha256=bf8ef4ab514a4e6d4554cb4326b2004eba5036ae05cf765cfe51aba9706a72a8
866+
puma (8.0.1) sha256=7b94e50c07655718c1fb8ae41a11fc06c7d61293208b3aa608ff71a46d3ad37c
866867
puma_worker_killer (1.0.0) sha256=12dc54feecb1758df70d9f4788841423c5416aa370feda4e51e2112a5ff909e9
867868
racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
868869
rack (3.2.5) sha256=4cbd0974c0b79f7a139b4812004a62e4c60b145cba76422e288ee670601ed6d3
@@ -953,7 +954,7 @@ CHECKSUMS
953954
zeitwerk (2.7.5) sha256=d8da92128c09ea6ec62c949011b00ed4a20242b255293dd66bf41545398f73dd
954955

955956
RUBY VERSION
956-
ruby 4.0.3
957+
ruby 4.0.5
957958

958959
BUNDLED WITH
959-
4.0.5
960+
4.0.12

config/puma.rb

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,7 @@
1717
plugin :tmp_restart
1818

1919
before_fork do
20-
require "barnes"
2120
require "puma_worker_killer"
2221

2322
PumaWorkerKiller.enable_rolling_restart # Default is every 6 hours
24-
25-
Barnes.start
2623
end
27-
28-
# on_worker_boot do
29-
# Barnes.start
30-
# end

0 commit comments

Comments
 (0)