Skip to content

Commit

Permalink
Merge pull request #951 from CHSS-IT/puma_6.5
Browse files Browse the repository at this point in the history
Bump puma to 6.5
  • Loading branch information
CraigJZ authored Dec 10, 2024
2 parents cb8c299 + f7557b3 commit 93e9d5e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ gem 'rails', '7.2.2'
# Use postgresql as the database for Active Record
gem 'pg', '~> 1.5'
# Use Puma as the app server
gem 'puma', git: 'https://github.com/puma/puma.git', branch: 'master'
gem 'puma', '~> 6.5'
# Use SCSS for stylesheets
gem "dartsass-rails", "~> 0.5.1"
# Use Terser as compressor for JavaScript assets
Expand Down
12 changes: 3 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
GIT
remote: https://github.com/puma/puma.git
revision: 6f4142625f1808d6fcc45dcc80ac0bb66f83b7b8
branch: master
specs:
puma (6.4.3)
nio4r (~> 2.0)

GIT
remote: https://github.com/twbs/bootstrap-rubygem.git
revision: 8aebab256f38bea5d8595be54159436af49f050e
Expand Down Expand Up @@ -257,6 +249,8 @@ GEM
psych (5.2.0)
stringio
public_suffix (5.0.4)
puma (6.5.0)
nio4r (~> 2.0)
racc (1.8.1)
rack (2.2.10)
rack-cas (0.16.1)
Expand Down Expand Up @@ -431,7 +425,7 @@ DEPENDENCIES
net-sftp (~> 4.0)
net-ssh (~> 7.2)
pg (~> 1.5)
puma!
puma (~> 6.5)
rack-cas (~> 0.16.1)
rack-mini-profiler (~> 3.3)
rails (= 7.2.2)
Expand Down

0 comments on commit 93e9d5e

Please sign in to comment.