Merge branch 'master' into snyk-fix-3df927077dcb814e1f2b7ccdeff4df65

Gemfile

@@ -10,7 +10,7 @@ gem 'rails', '~> 6.1', '>= 6.1.7.5'
 # Use postgres as the database for Active Record
 gem 'pg', '>= 0.4.4'
 # Use Puma as the app server
-gem 'puma', '>= 6.3.1'
+gem 'puma', '>= 6.4.2'
 # Use SCSS for stylesheets
 gem 'sass-rails', '>= 6.0.0'
 # Use Uglifier as compressor for JavaScript assets

Gemfile.lock

@@ -245,7 +245,7 @@ GEM
       timeout
     net-smtp (0.3.3)
       net-protocol
-    nio4r (2.5.9)
+    nio4r (2.7.0)
     nokogiri (1.15.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -266,7 +266,7 @@ GEM
     psych (5.1.0)
       stringio
     public_suffix (5.0.3)
-    puma (6.3.1)
+    puma (6.4.2)
       nio4r (~> 2.0)
     racc (1.7.3)
     rack (2.2.8)
@@ -453,7 +453,7 @@ DEPENDENCIES
   oauth (~> 0.5.1)
   oauthenticator (~> 1.4, >= 1.4.1)
   pg (>= 0.4.4)
-  puma (>= 6.3.1)
+  puma (>= 6.4.2)
   rails (~> 6.1, >= 6.1.7.5)
   rails_lti2_provider!
   rdoc