diff --git a/Gemfile b/Gemfile index 4e9a2f5..e792e62 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ gem 'rails', '~> 6.0.2', '>= 6.0.2.1' # Use postgresql as the database for Active Record gem 'pg', '>= 0.18', '< 2.0' # Use Puma as the app server -gem 'puma', '~> 4.1' +gem 'puma', '~> 4.3' # Use SCSS for stylesheets gem 'sass-rails', '>= 6' # Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker diff --git a/Gemfile.lock b/Gemfile.lock index 541268d..22792aa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -95,6 +95,7 @@ GEM responders warden (~> 1.2.3) erubi (1.9.0) + ffi (1.11.3) ffi (1.11.3-x64-mingw32) formtastic (3.1.5) actionpack (>= 3.2.13) @@ -141,16 +142,20 @@ GEM mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.13.0) + msgpack (1.3.1) msgpack (1.3.1-x64-mingw32) - nio4r (2.5.2) + nio4r (2.5.8) + nokogiri (1.10.7) + mini_portile2 (~> 2.4.0) nokogiri (1.10.7-x64-mingw32) mini_portile2 (~> 2.4.0) orm_adapter (0.5.0) + pg (1.1.4) pg (1.1.4-x64-mingw32) polyamorous (2.3.0) activerecord (>= 5.0) public_suffix (4.0.1) - puma (4.3.1) + puma (4.3.11) nio4r (~> 2.0) rack (2.0.8) rack-proxy (0.6.5) @@ -197,6 +202,8 @@ GEM rubyzip (2.0.0) sass-rails (6.0.0) sassc-rails (~> 2.1, >= 2.1.1) + sassc (2.2.1) + ffi (~> 1.9) sassc (2.2.1-x64-mingw32) ffi (~> 1.9) sassc-rails (2.1.2) @@ -249,6 +256,7 @@ GEM PLATFORMS x64-mingw32 + x86_64-linux DEPENDENCIES activeadmin @@ -258,7 +266,7 @@ DEPENDENCIES devise jbuilder (~> 2.7) pg (>= 0.18, < 2.0) - puma (~> 4.1) + puma (~> 4.3) rails (~> 6.0.2, >= 6.0.2.1) sass-rails (>= 6) selenium-webdriver