Skip to content

Commit

Permalink
Merge pull request #101 from heynan0/bump-puma-to-4-3-6-to-avoid-comp…
Browse files Browse the repository at this point in the history
…ilation-problem

Update puma to 4.3.6
  • Loading branch information
joelhawksley committed Oct 6, 2020
2 parents 3c09dca + d74e440 commit 0fd1832
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Expand Up @@ -9,7 +9,7 @@ gem "rake", "~> 12.0"
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem "rails", rails_version == "master" ? { github: "rails/rails" } : rails_version
# Use Puma as the app server
gem "puma", "~> 4.1"
gem "puma", "~> 4.3.6"
# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
gem "webpacker", "~> 5.0"

Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Expand Up @@ -123,7 +123,7 @@ GEM
pry-rails (0.3.9)
pry (>= 0.10.4)
public_suffix (4.0.5)
puma (4.3.5)
puma (4.3.6)
nio4r (~> 2.0)
rack (2.2.3)
rack-proxy (0.6.5)
Expand Down Expand Up @@ -230,7 +230,7 @@ DEPENDENCIES
primer_view_components!
pry
pry-rails
puma (~> 4.1)
puma (~> 4.3.6)
rails (= 6.0.3.3)
rake (~> 12.0)
rubocop (= 0.74)
Expand Down
2 changes: 1 addition & 1 deletion demo/Gemfile
Expand Up @@ -8,7 +8,7 @@ gem "rake", "~> 12.0"
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem "rails", rails_version == "master" ? { github: "rails/rails" } : rails_version
# Use Puma as the app server
gem "puma", "~> 4.1"
gem "puma", "~> 4.3.6"
# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
gem "webpacker", "~> 5.0"

Expand Down
4 changes: 2 additions & 2 deletions demo/Gemfile.lock
Expand Up @@ -116,7 +116,7 @@ GEM
pry-rails (0.3.9)
pry (>= 0.10.4)
public_suffix (4.0.5)
puma (4.3.5)
puma (4.3.6)
nio4r (~> 2.0)
rack (2.2.3)
rack-proxy (0.6.5)
Expand Down Expand Up @@ -195,7 +195,7 @@ DEPENDENCIES
minitest (~> 5.0)
primer_view_components!
pry-rails
puma (~> 4.1)
puma (~> 4.3.6)
rails (= 6.0.3.3)
rake (~> 12.0)
spring
Expand Down

1 comment on commit 0fd1832

@vercel
Copy link

@vercel vercel bot commented on 0fd1832 Oct 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.