diff --git a/Gemfile b/Gemfile index cc2b114..4020c9d 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,7 @@ gem 'rails', '~> 5.2.2' gem 'pg', '>= 0.18', '< 2.0' # gem 'pg' # adminos conflict # Use Puma as the app server -gem 'puma', '~> 3.11' +gem 'puma', '~> 3.12' # gem 'puma', '~> 3.7' # adminos conflict # Use SCSS for stylesheets gem 'sass-rails', '~> 5.0' diff --git a/Gemfile.lock b/Gemfile.lock index ec1a62f..44d670a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -248,7 +248,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_magick (4.9.3) mini_mime (1.0.1) mini_portile2 (2.4.0) @@ -322,7 +324,7 @@ GEM pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) - puma (3.12.1) + puma (3.12.6) rack (2.0.7) rack-protection (2.0.5) rack @@ -548,7 +550,7 @@ DEPENDENCIES pg_search postal-rails (~> 1.0) pry - puma (~> 3.11) + puma (~> 3.12) rails (~> 5.2.2) redis (~> 4.0) role_model