Skip to content

Commit c26c26c

Browse files
authored
Merge pull request #1839 from codetriage/schneems/puma-pre-yall
Update puma
2 parents 2f19341 + c9b8411 commit c26c26c

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
strategy:
88
fail-fast: false
99
matrix:
10-
ruby: ["3.1"]
10+
ruby: ["3.2.9"]
1111
name: Running tests with Ruby ${{ matrix.ruby }}
1212
services:
1313
postgres:

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ end
2424
gem "git_hub_bub"
2525

2626
# Application server & middleware
27-
gem "puma"
27+
gem "puma", "7.0.0.pre1"
2828
gem "puma_worker_killer"
2929
gem "rack-timeout"
3030
gem "rack-canonical-host"

Gemfile.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ GEM
157157
i18n (>= 1.8.11, < 2)
158158
faraday (0.17.6)
159159
multipart-post (>= 1.2, < 3)
160-
ffi (1.15.4)
160+
ffi (1.17.2)
161161
flamegraph (0.9.5)
162162
foreman (0.87.2)
163163
get_process_mem (0.2.7)
@@ -217,7 +217,7 @@ GEM
217217
minitest (5.20.0)
218218
mocha (2.1.0)
219219
ruby2_keywords (>= 0.0.5)
220-
msgpack (1.5.6)
220+
msgpack (1.8.0)
221221
multi_xml (0.6.0)
222222
multipart-post (2.3.0)
223223
mustermann (3.0.0)
@@ -259,14 +259,14 @@ GEM
259259
omniauth-rails_csrf_protection (1.0.1)
260260
actionpack (>= 4.2)
261261
omniauth (~> 2.0)
262-
optimist (3.0.1)
262+
optimist (3.2.1)
263263
orm_adapter (0.5.0)
264264
parallel (1.23.0)
265265
parser (3.2.2.4)
266266
ast (~> 2.4.1)
267267
racc
268268
pdf-core (0.9.0)
269-
pg (1.2.3)
269+
pg (1.6.1)
270270
prawn (2.4.0)
271271
pdf-core (~> 0.9.0)
272272
ttfunk (~> 1.7)
@@ -282,7 +282,7 @@ GEM
282282
coderay (~> 1.1)
283283
method_source (~> 1.0)
284284
public_suffix (5.0.3)
285-
puma (6.4.0)
285+
puma (7.0.0.pre1)
286286
nio4r (~> 2.0)
287287
puma_worker_killer (0.3.1)
288288
get_process_mem (~> 0.2)
@@ -340,7 +340,7 @@ GEM
340340
rb-fsevent (0.11.0)
341341
rb-inotify (0.10.1)
342342
ffi (~> 1.0)
343-
rbtrace (0.4.14)
343+
rbtrace (0.5.2)
344344
ffi (>= 1.0.6)
345345
msgpack (>= 0.4.3)
346346
optimist (>= 3.0.0)
@@ -529,7 +529,7 @@ DEPENDENCIES
529529
prawn
530530
premailer-rails
531531
pry
532-
puma
532+
puma (= 7.0.0.pre1)
533533
puma_worker_killer
534534
rack-canonical-host
535535
rack-mini-profiler
@@ -567,7 +567,7 @@ DEPENDENCIES
567567
yard (~> 0.9.28)
568568

569569
RUBY VERSION
570-
ruby 3.1.4p223
570+
ruby 3.2.9p265
571571

572572
BUNDLED WITH
573-
2.3.23
573+
2.7.1

0 commit comments

Comments
 (0)