diff --git a/Gemfile b/Gemfile index 008abee..fa8736a 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } gem 'devise' gem 'cancancan' -ruby "3.0.4" +ruby "3.1.2" # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main" gem "rails", "~> 7.0.2.3" @@ -16,7 +16,7 @@ gem "sprockets-rails" gem "mysql2", "~> 0.5" # Use the Puma web server [https://github.com/puma/puma] -gem "puma", "~> 5.0" +gem "puma", git: 'https://github.com/puma/puma', branch: 'master' # Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails] gem "importmap-rails" diff --git a/Gemfile.lock b/Gemfile.lock index aef0f01..977c9c1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,11 @@ +GIT + remote: https://github.com/puma/puma + revision: e9f09ba1fe6b168bed7fff59d0bdbfd65351cf9d + branch: master + specs: + puma (5.6.4) + nio4r (~> 2.0) + GEM remote: https://rubygems.org/ specs: @@ -148,8 +156,6 @@ GEM racc (~> 1.4) orm_adapter (0.5.0) public_suffix (4.0.6) - puma (5.6.4) - nio4r (~> 2.0) racc (1.6.0) rack (2.2.3) rack-test (1.1.0) @@ -243,7 +249,7 @@ DEPENDENCIES importmap-rails jbuilder mysql2 (~> 0.5) - puma (~> 5.0) + puma! rails (~> 7.0.2.3) selenium-webdriver sprockets-rails @@ -254,7 +260,7 @@ DEPENDENCIES webdrivers RUBY VERSION - ruby 3.0.3p157 + ruby 3.1.2p20 BUNDLED WITH 2.3.6