diff --git a/Gemfile b/Gemfile index 76933cb..0496118 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ gem 'jinda' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 6.0.0' # Use Puma as the app server -gem 'puma', '~> 3.11' +gem 'puma', '~> 4.3' # Use SCSS for stylesheets gem 'sass-rails', '~> 5' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder diff --git a/Gemfile.lock b/Gemfile.lock index 8898c7a..256ebe8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -225,7 +225,9 @@ GEM mime-types (3.3) mime-types-data (~> 3.2015) mime-types-data (3.2019.0904) - mimemagic (0.3.3) + mimemagic (0.3.10) + nokogiri (~> 1) + rake mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.11.3) @@ -280,7 +282,8 @@ GEM byebug (~> 11.0) pry (~> 0.10) public_suffix (4.0.1) - puma (3.12.1) + puma (4.3.8) + nio4r (~> 2.0) rack (2.0.7) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -443,7 +446,7 @@ DEPENDENCIES omniauth-rails_csrf_protection prawn pry-byebug - puma (~> 3.11) + puma (~> 4.3) rails (~> 6.0.0) rb-fsevent redcarpet