diff --git a/Gemfile b/Gemfile index 9174516..64b0177 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,7 @@ gem 'rails', '~> 6.0.0' # gem 'sqlite3', '~> 1.4' gem 'pg' # Use Puma as the app server -gem 'puma', '~> 3.11' +gem 'puma', '~> 4.3' # Use SCSS for stylesheets gem 'sass-rails', '~> 5' # Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker diff --git a/Gemfile.lock b/Gemfile.lock index 1c5ad70..2ce67f5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -94,7 +94,9 @@ GEM marcel (0.3.3) mimemagic (~> 0.3.2) method_source (0.9.2) - mimemagic (0.3.3) + mimemagic (0.3.10) + nokogiri (~> 1) + rake mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.12.2) @@ -102,8 +104,10 @@ GEM nio4r (2.5.2) nokogiri (1.10.4) mini_portile2 (~> 2.4.0) + pg (1.3.4) public_suffix (4.0.1) - puma (3.12.1) + puma (4.3.12) + nio4r (~> 2.0) rack (2.0.7) rack-proxy (0.6.5) rack @@ -170,7 +174,6 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sqlite3 (1.4.1) thor (0.20.3) thread_safe (0.3.6) tilt (2.0.10) @@ -205,14 +208,14 @@ DEPENDENCIES capybara (>= 2.15) jbuilder (~> 2.7) listen (>= 3.0.5, < 3.2) - puma (~> 3.11) + pg + puma (~> 4.3) rails (~> 6.0.0) responders sass-rails (~> 5) selenium-webdriver spring spring-watcher-listen (~> 2.0.0) - sqlite3 (~> 1.4) tzinfo-data web-console (>= 3.3.0) webdrivers