diff --git a/Gemfile b/Gemfile index bb1e21b..f74f140 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ gem 'rails', '~> 5.2.4.2' # Use mysql as the database for Active Record gem 'mysql2', '>= 0.4.4', '< 0.6.0' # Use Puma as the app server -gem 'puma', '~> 3.12' +gem 'puma', '~> 5.6' # Use SCSS for stylesheets gem 'sass-rails', '~> 5.0' # Use Uglifier as compressor for JavaScript assets diff --git a/Gemfile.lock b/Gemfile.lock index 90f7284..89536d9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -78,11 +78,11 @@ GEM capistrano-rbenv (2.2.0) capistrano (~> 3.1) sshkit (~> 1.3) - capistrano3-puma (3.1.1) + capistrano3-puma (5.2.0) capistrano (~> 3.7) capistrano-bundler - puma (~> 3.4) - concurrent-ruby (1.1.8) + puma (>= 4.0, < 6.0) + concurrent-ruby (1.1.9) crass (1.0.6) docsplit (0.7.6) domain_name (0.5.20190701) @@ -106,7 +106,7 @@ GEM httparty (0.18.1) mime-types (~> 3.0) multi_xml (>= 0.5.2) - i18n (1.8.9) + i18n (1.9.1) concurrent-ruby (~> 1.0) jbuilder (2.11.2) activesupport (>= 5.0.0) @@ -185,7 +185,8 @@ GEM oauth2 (~> 1.4) omniauth (>= 1.9, < 3) orm_adapter (0.5.0) - puma (3.12.6) + puma (5.6.2) + nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) rack-protection (2.1.0) @@ -216,7 +217,7 @@ GEM method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) - rake (13.0.3) + rake (13.0.6) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) @@ -316,7 +317,7 @@ DEPENDENCIES mysql2 (>= 0.4.4, < 0.6.0) nokogiri omniauth-google-oauth2 - puma (~> 3.12) + puma (~> 5.6) rails (~> 5.2.4.2) recaptcha rubyzip