Merge branch 'master' into master

Gemfile.lock

@@ -127,9 +127,8 @@ GEM
       aws_cf_signer
       rest-client
     cocoon (1.2.14)
-    codecov (0.2.11)
-      json
-      simplecov
+    codecov (0.5.0)
+      simplecov (>= 0.15, < 0.22)
     coderay (1.1.1)
     concurrent-ruby (1.1.8)
     countable-rails (0.0.1)
@@ -162,7 +161,7 @@ GEM
     devise_ichain_authenticatable (0.3.2)
       devise (>= 2.2)
     diff-lcs (1.3)
-    docile (1.3.2)
+    docile (1.3.5)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.5)
@@ -270,7 +269,7 @@ GEM
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
-    json (2.3.1)
+    json (2.5.1)
     json-schema (2.8.1)
       addressable (>= 2.4)
     jsonapi-renderer (0.2.2)
@@ -421,7 +420,8 @@ GEM
       method_source (~> 0.8.1)
       slop (~> 3.4)
     public_suffix (3.1.1)
-    puma (3.12.6)
+    puma (5.2.1)
+      nio4r (~> 2.0)
     racc (1.5.2)
     rack (2.2.3)
     rack-openid (1.3.1)
@@ -592,10 +592,12 @@ GEM
     shellany (0.0.1)
     shoulda-matchers (4.1.2)
       activesupport (>= 4.2.0)
-    simplecov (0.19.0)
+    simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.2)
     sixarm_ruby_unaccent (1.2.0)
     skylight (3.1.5)
       skylight-core (= 3.1.5)
@@ -744,7 +746,7 @@ DEPENDENCIES
   pronto-haml
   pronto-rubocop
   pry
-  puma (~> 3.0)
+  puma (~> 5.2)
   rails (~> 5.2)
   rails-assets-bootstrap-markdown!
   rails-assets-bootstrap-select!
@@ -792,5 +794,8 @@ DEPENDENCIES
   webmock
   whenever
 
+RUBY VERSION
+   ruby 2.6.6p146
+
 BUNDLED WITH
    1.17.3