diff --git a/server_rails/find_my_friends.rb/Gemfile b/server_rails/find_my_friends.rb/Gemfile index a0a75c0..02d8952 100644 --- a/server_rails/find_my_friends.rb/Gemfile +++ b/server_rails/find_my_friends.rb/Gemfile @@ -8,7 +8,7 @@ gem 'rails', '~> 5.2.3' # Use sqlite3 as the database for Active Record gem 'sqlite3' # Use Puma as the app server -gem 'puma', '~> 3.11' +gem 'puma', '~> 4.3' # Use SCSS for stylesheets gem 'sass-rails', '~> 5.0' # Use Uglifier as compressor for JavaScript assets diff --git a/server_rails/find_my_friends.rb/Gemfile.lock b/server_rails/find_my_friends.rb/Gemfile.lock index 703894f..014fccf 100644 --- a/server_rails/find_my_friends.rb/Gemfile.lock +++ b/server_rails/find_my_friends.rb/Gemfile.lock @@ -77,6 +77,7 @@ GEM duktape (2.3.0.0) erubi (1.8.0) execjs (2.7.0) + ffi (1.11.1) ffi (1.11.1-x86-mingw32) globalid (0.4.2) activesupport (>= 4.2.0) @@ -97,12 +98,16 @@ GEM mini_mime (1.0.1) mini_portile2 (2.4.0) minitest (5.11.3) + msgpack (1.3.0) msgpack (1.3.0-x86-mingw32) nio4r (2.3.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) nokogiri (1.10.3-x86-mingw32) mini_portile2 (~> 2.4.0) public_suffix (3.1.0) - puma (3.12.1) + puma (4.3.11) + nio4r (~> 2.0) rack (2.0.7) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -157,6 +162,7 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) + sqlite3 (1.4.2) thor (0.20.3) thread_safe (0.3.6) tilt (2.0.9) @@ -182,6 +188,7 @@ GEM PLATFORMS x86-mingw32 + x86_64-linux DEPENDENCIES bootsnap (>= 1.1.0) @@ -191,10 +198,11 @@ DEPENDENCIES coffee-rails (~> 4.2) duktape jbuilder (~> 2.5) - puma (~> 3.11) + puma (~> 4.3) rails (~> 5.2.3) sass-rails (~> 5.0) selenium-webdriver + sqlite3 turbolinks (~> 5) tzinfo-data uglifier (>= 1.3.0)