Skip to content

Commit 4c86ee4

Browse files
authored
Merge pull request #342 from themarshallproject/dependabot/bundler/puma-4.3.5
Bump puma from 3.12.6 to 4.3.5
2 parents 00267bf + e3eb2cc commit 4c86ee4

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ gem 'sdoc', '~> 1.0.0', group: :doc
1616

1717
gem 'rack-cache'
1818
gem 'bcrypt', '~> 3.1.12'
19-
gem 'puma', '~> 3.12'
19+
gem 'puma', '~> 4.3'
2020
gem 'rails_12factor'
2121

2222
gem 'simple_form', '~> 5.0'

Gemfile.lock

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,8 @@ GEM
172172
coderay (~> 1.1.0)
173173
method_source (~> 0.9.0)
174174
public_suffix (3.0.3)
175-
puma (3.12.6)
175+
puma (4.3.5)
176+
nio4r (~> 2.0)
176177
rack (2.2.3)
177178
rack-cache (1.9.0)
178179
rack (>= 0.4)
@@ -329,7 +330,7 @@ DEPENDENCIES
329330
letter_opener
330331
pg (~> 0.21)
331332
premailer-rails
332-
puma (~> 3.12)
333+
puma (~> 4.3)
333334
rack-cache
334335
rails (~> 5.2.4)
335336
rails-controller-testing

0 commit comments

Comments
 (0)