diff --git a/Gemfile b/Gemfile index 57c42ef2..c582f04f 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,7 @@ end gem 'rails', '~> 5.2.3' # Use Puma as the app server -gem 'puma', '~> 3.0' +gem 'puma', '~> 5.3' # respond_to methods have been extracted to the responders gem # http://edgeguides.rubyonrails.org/upgrading_ruby_on_rails.html#responders diff --git a/Gemfile.lock b/Gemfile.lock index b6a4708e..dd380dca 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -125,10 +125,8 @@ GEM aws_cf_signer rest-client cocoon (1.2.12) - codecov (0.1.14) - json - simplecov - url + codecov (0.5.2) + simplecov (>= 0.15, < 0.22) coderay (1.1.1) concurrent-ruby (1.1.5) connection_pool (2.2.2) @@ -162,7 +160,7 @@ GEM devise_ichain_authenticatable (0.3.2) devise (>= 2.2) diff-lcs (1.3) - docile (1.3.1) + docile (1.4.0) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) dotenv (2.7.2) @@ -255,7 +253,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (4.2.1) railties (>= 3.2.16) - json (2.2.0) + json (2.5.1) json-schema (2.8.1) addressable (>= 2.4) jsonapi-renderer (0.2.0) @@ -283,7 +281,9 @@ GEM mime-types (3.2.2) mime-types-data (~> 3.2015) mime-types-data (3.2018.0812) - mimemagic (0.3.2) + mimemagic (0.3.10) + nokogiri (~> 1) + rake mina (1.2.3) open4 (~> 1.3.4) rake @@ -380,7 +380,8 @@ GEM slop (~> 3.4) psych (3.1.0) public_suffix (3.1.1) - puma (3.12.1) + puma (5.3.1) + nio4r (~> 2.0) rack (2.0.8) rack-openid (1.3.1) rack (>= 1.1.0) @@ -532,11 +533,12 @@ GEM shellany (0.0.1) shoulda-matchers (4.0.1) activesupport (>= 4.2.0) - simplecov (0.16.1) + simplecov (0.21.2) docile (~> 1.1) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.2) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.12.3) + simplecov_json_formatter (0.1.3) sixarm_ruby_unaccent (1.2.0) skylight (3.1.5) skylight-core (= 3.1.5) @@ -587,7 +589,6 @@ GEM unicode_utils (1.4.0) unobtrusive_flash (3.3.1) railties - url (0.3.2) warden (1.2.8) rack (>= 2.0.6) web-console (3.7.0) @@ -681,7 +682,7 @@ DEPENDENCIES piwik_analytics (~> 1.0.1) prawn-qrcode prawn-rails - puma (~> 3.0) + puma (~> 5.3) rails (~> 5.2.3) rails-assets-bootstrap-markdown! rails-assets-bootstrap-select!