Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump puma from 3.12.6 to 4.3.12 #326

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Bump puma from 3.12.6 to 4.3.12 #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ruby "2.6.6"
# The following are from the default generated Gemfile for a new Rails 5.2 app:

gem 'rails', '~> 5.2.4', '>= 5.2.4.3' # This is the version string generated by `rails new` on the current latest ~> 5 version of rails (5.2.4.3)
gem 'puma', '~> 3.11'
gem 'puma', '~> 4.3'
gem 'sass-rails', '~> 5.0'
gem 'uglifier', '>= 1.3.0'
gem 'therubyracer', platforms: :ruby # Default Rails 5.2 uses mini_racer, but we're already using therubyracer, so we'll stay with that for now.
Expand Down
15 changes: 9 additions & 6 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
GIT
remote: git://github.com/redcross/arcdata_core.git
remote: https://github.com/redcross/arcdata_core.git
revision: 3869f8a91a0c17a8eed25400cd61b6b8d44674a9
branch: upgrade/rails-6
specs:
Expand All @@ -8,7 +8,7 @@ GIT
rails (>= 5.0, < 7.x)

GIT
remote: git://github.com/redcross/openid-connect-engine.git
remote: https://github.com/redcross/openid-connect-engine.git
revision: 0247bae4dc4a0797559544a3b7ce08859f4fbdb5
branch: rails-6-upgrade
specs:
Expand All @@ -19,7 +19,7 @@ GIT
rails (>= 5.0, < 7.x)

GIT
remote: git://github.com/seyhunak/twitter-bootstrap-rails.git
remote: https://github.com/seyhunak/twitter-bootstrap-rails.git
revision: 1d93c5a77049b3d21d17c847ad0531d7714fa229
branch: bootstrap3
specs:
Expand Down Expand Up @@ -1382,7 +1382,9 @@ GEM
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2021.0225)
mimemagic (0.3.5)
mimemagic (0.3.10)
nokogiri (~> 1)
rake
mini_mime (1.0.2)
mini_portile2 (2.5.0)
minitest (5.14.4)
Expand Down Expand Up @@ -1442,7 +1444,8 @@ GEM
httpclient (~> 2.8, >= 2.8.3)
json (>= 2.2.0, < 3)
timers (>= 4.3.0)
puma (3.12.6)
puma (4.3.12)
nio4r (~> 2.0)
racc (1.5.2)
rack (2.2.3)
rack-oauth2 (1.16.0)
Expand Down Expand Up @@ -1712,7 +1715,7 @@ DEPENDENCIES
pdfkit
pg (~> 0.2)
pubnub
puma (~> 3.11)
puma (~> 4.3)
rack-rewrite
rails (~> 5.2.4, >= 5.2.4.3)
rails-controller-testing
Expand Down