diff --git a/Gemfile b/Gemfile old mode 100755 new mode 100644 index 092c066..ac80e8f --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ ruby '2.6.2' gem 'rails', '~> 5.2.2', '>= 5.2.2.1' # Use sqlite3 as the database for Active Record # Use Puma as the app server -gem 'puma', '~> 3.11' +gem 'puma', '~> 4.3' # Use SCSS for stylesheets gem "bootstrap-sass", ">= 3.4.1" gem 'jquery-rails' diff --git a/Gemfile.lock b/Gemfile.lock old mode 100755 new mode 100644 index 8870aaf..a835de4 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -109,7 +109,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.1) mini_portile2 (2.4.0) minitest (5.11.3) @@ -119,7 +121,8 @@ GEM mini_portile2 (~> 2.4.0) pg (1.1.4) public_suffix (3.0.3) - puma (3.12.1) + puma (4.3.12) + nio4r (~> 2.0) rack (2.0.7) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -224,7 +227,7 @@ DEPENDENCIES jquery-rails listen (>= 3.0.5, < 3.2) pg - puma (~> 3.11) + puma (~> 4.3) rails (~> 5.2.2, >= 5.2.2.1) sass-rails (~> 5.0) selenium-webdriver