diff --git a/hyrax/Gemfile b/hyrax/Gemfile index a39a067b0e00e6fb9b7c16351ba93dde888ff4d8..e20b7e23755ed37392057016d0c29d492df18b24 100644 --- a/hyrax/Gemfile +++ b/hyrax/Gemfile @@ -8,7 +8,7 @@ gem 'rails', '~> 5.2.6' # Use sqlite3 as the database for Active Record gem "sqlite3", "~> 1.3.0" # Use Puma as the app server -gem 'puma', '~> 3.11' +gem 'puma', '>= 5.6.9', '< 6' # Use SCSS for stylesheets gem 'sass-rails', '~> 5.0' # Use Uglifier as compressor for JavaScript assets diff --git a/hyrax/Gemfile.lock b/hyrax/Gemfile.lock index 86b49f9eb7f93a3eb344bb7eb8d90b4dd5183244..d73fca84a761b3f946774937670b140a63fb9a64 100644 --- a/hyrax/Gemfile.lock +++ b/hyrax/Gemfile.lock @@ -695,7 +695,8 @@ GEM power_converter (0.1.2) psych (3.3.4) public_suffix (5.1.1) - puma (3.12.6) + puma (5.6.9) + nio4r (~> 2.0) qa (5.14.0) activerecord-import deprecation @@ -1076,7 +1077,7 @@ DEPENDENCIES omniauth-rails_csrf_protection omniauth-saml (>= 2.1.3, < 3) pg - puma (~> 3.11) + puma (>= 5.6.9, < 6) rails (~> 5.2.6) redis (~> 4.0) riiif (~> 2.3)