Rails 6.1.4.7

Gemfile

@@ -19,7 +19,7 @@ git_source(:github) do |repo_name|
   "https://github.com/#{repo_name}.git"
 end
 
-gem 'rails', '6.0.6'
+gem 'rails', '6.1.4.7'
 gem 'rails-controller-testing', '~> 1.0.5'
 
 # Compile Sprockets assets concurrently in `assets:precompile`.
@@ -284,7 +284,7 @@ gem 'firebase_token_generator'
 gem 'sshkit'
 gem 'validates_email_format_of'
 
-gem 'composite_primary_keys', '~> 12.0'
+gem 'composite_primary_keys', '~> 13.0'
 
 # GitHub API; used by the DotD script to automatically create new
 # releases on deploy

Gemfile.lock

@@ -134,38 +134,40 @@ GEM
       aws-sdk-route53
       aws-sdk-s3
       thor
-    actioncable (6.0.6)
-      actionpack (= 6.0.6)
+    actioncable (6.1.4.7)
+      actionpack (= 6.1.4.7)
+      activesupport (= 6.1.4.7)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.6)
-      actionpack (= 6.0.6)
-      activejob (= 6.0.6)
-      activerecord (= 6.0.6)
-      activestorage (= 6.0.6)
-      activesupport (= 6.0.6)
+    actionmailbox (6.1.4.7)
+      actionpack (= 6.1.4.7)
+      activejob (= 6.1.4.7)
+      activerecord (= 6.1.4.7)
+      activestorage (= 6.1.4.7)
+      activesupport (= 6.1.4.7)
       mail (>= 2.7.1)
-    actionmailer (6.0.6)
-      actionpack (= 6.0.6)
-      actionview (= 6.0.6)
-      activejob (= 6.0.6)
+    actionmailer (6.1.4.7)
+      actionpack (= 6.1.4.7)
+      actionview (= 6.1.4.7)
+      activejob (= 6.1.4.7)
+      activesupport (= 6.1.4.7)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.6)
-      actionview (= 6.0.6)
-      activesupport (= 6.0.6)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.4.7)
+      actionview (= 6.1.4.7)
+      activesupport (= 6.1.4.7)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.6)
-      actionpack (= 6.0.6)
-      activerecord (= 6.0.6)
-      activestorage (= 6.0.6)
-      activesupport (= 6.0.6)
+    actiontext (6.1.4.7)
+      actionpack (= 6.1.4.7)
+      activerecord (= 6.1.4.7)
+      activestorage (= 6.1.4.7)
+      activesupport (= 6.1.4.7)
       nokogiri (>= 1.8.5)
-    actionview (6.0.6)
-      activesupport (= 6.0.6)
+    actionview (6.1.4.7)
+      activesupport (= 6.1.4.7)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -178,27 +180,29 @@ GEM
     active_record_query_trace (1.5.3)
     active_record_union (1.3.0)
       activerecord (>= 4.0)
-    activejob (6.0.6)
-      activesupport (= 6.0.6)
+    activejob (6.1.4.7)
+      activesupport (= 6.1.4.7)
       globalid (>= 0.3.6)
-    activemodel (6.0.6)
-      activesupport (= 6.0.6)
-    activerecord (6.0.6)
-      activemodel (= 6.0.6)
-      activesupport (= 6.0.6)
+    activemodel (6.1.4.7)
+      activesupport (= 6.1.4.7)
+    activerecord (6.1.4.7)
+      activemodel (= 6.1.4.7)
+      activesupport (= 6.1.4.7)
     activerecord-import (1.0.8)
       activerecord (>= 3.2)
-    activestorage (6.0.6)
-      actionpack (= 6.0.6)
-      activejob (= 6.0.6)
-      activerecord (= 6.0.6)
-      marcel (~> 1.0)
-    activesupport (6.0.6)
+    activestorage (6.1.4.7)
+      actionpack (= 6.1.4.7)
+      activejob (= 6.1.4.7)
+      activerecord (= 6.1.4.7)
+      activesupport (= 6.1.4.7)
+      marcel (~> 1.0.0)
+      mini_mime (>= 1.1.0)
+    activesupport (6.1.4.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     acts_as_list (1.0.4)
       activerecord (>= 4.2)
     addressable (2.8.1)
@@ -301,9 +305,9 @@ GEM
       climate_control (>= 0.0.3, < 1.0)
     coderay (1.1.3)
     colorize (0.8.1)
-    composite_primary_keys (12.0.10)
-      activerecord (~> 6.0.0)
-    concurrent-ruby (1.1.10)
+    composite_primary_keys (13.0.4)
+      activerecord (~> 6.1.0)
+    concurrent-ruby (1.2.2)
     connection_pool (2.2.1)
     crack (0.4.5)
       rexml
@@ -338,6 +342,7 @@ GEM
       json
       json-schema
       rest-client
+    date (3.3.3)
     declarative (0.0.20)
     devise (4.7.3)
       bcrypt (~> 3.0)
@@ -355,7 +360,7 @@ GEM
       actionpack (>= 4)
       i18n
     e2mmap (0.1.0)
-    erubi (1.11.0)
+    erubi (1.12.0)
     erubis (2.7.0)
     eventmachine (1.2.7)
     execjs (2.7.0)
@@ -421,7 +426,7 @@ GEM
     geocoder (1.6.4)
     get_process_mem (0.2.3)
     gherkin (5.1.0)
-    globalid (1.0.0)
+    globalid (1.1.0)
       activesupport (>= 5.0)
     google-apis-analytics_v3 (0.12.0)
       google-apis-core (>= 0.9.1, < 2.a)
@@ -522,8 +527,11 @@ GEM
     loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.1)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
     marcel (1.0.2)
     memoist (0.16.2)
     memory_profiler (0.9.10)
@@ -534,10 +542,10 @@ GEM
     mime-types-data (3.2020.0512)
     mini_magick (4.12.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.6.1)
+    mini_portile2 (2.8.1)
     mini_racer (0.3.1)
       libv8 (~> 8.4.255)
-    minitest (5.16.3)
+    minitest (5.17.0)
     minitest-around (0.5.0)
       minitest (~> 5.0)
     minitest-reporters (1.2.0)
@@ -558,15 +566,24 @@ GEM
     naturally (2.1.0)
     net-http-persistent (3.0.0)
       connection_pool (~> 2.2)
+    net-imap (0.3.4)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.1)
+      timeout
     net-scp (2.0.0)
       net-ssh (>= 2.6.5, < 6.0.0)
+    net-smtp (0.3.3)
+      net-protocol
     net-ssh (5.2.0)
     net_http_ssl_fix (0.0.10)
     netrc (0.11.0)
     newrelic_rpm (6.14.0)
     nio4r (2.5.8)
-    nokogiri (1.12.4)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.14.2)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     oauth2 (1.4.11)
       faraday (>= 0.17.3, < 3.0)
@@ -641,8 +658,8 @@ GEM
       multi_json (~> 1.0)
       pusher-signature (~> 0.1.8)
     pusher-signature (0.1.8)
-    racc (1.5.2)
-    rack (2.2.4)
+    racc (1.6.2)
+    rack (2.2.6.2)
     rack-cache (1.13.0)
       rack (>= 0.4)
     rack-mini-profiler (3.0.0)
@@ -663,20 +680,20 @@ GEM
       rack (>= 1.3)
     rack_csrf (2.5.0)
       rack (>= 1.1.0)
-    rails (6.0.6)
-      actioncable (= 6.0.6)
-      actionmailbox (= 6.0.6)
-      actionmailer (= 6.0.6)
-      actionpack (= 6.0.6)
-      actiontext (= 6.0.6)
-      actionview (= 6.0.6)
-      activejob (= 6.0.6)
-      activemodel (= 6.0.6)
-      activerecord (= 6.0.6)
-      activestorage (= 6.0.6)
-      activesupport (= 6.0.6)
-      bundler (>= 1.3.0)
-      railties (= 6.0.6)
+    rails (6.1.4.7)
+      actioncable (= 6.1.4.7)
+      actionmailbox (= 6.1.4.7)
+      actionmailer (= 6.1.4.7)
+      actionpack (= 6.1.4.7)
+      actiontext (= 6.1.4.7)
+      actionview (= 6.1.4.7)
+      activejob (= 6.1.4.7)
+      activemodel (= 6.1.4.7)
+      activerecord (= 6.1.4.7)
+      activestorage (= 6.1.4.7)
+      activesupport (= 6.1.4.7)
+      bundler (>= 1.15.0)
+      railties (= 6.1.4.7)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -687,12 +704,12 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.2.0)
       loofah (~> 2.2, >= 2.2.2)
-    railties (6.0.6)
-      actionpack (= 6.0.6)
-      activesupport (= 6.0.6)
+    railties (6.1.4.7)
+      actionpack (= 6.1.4.7)
+      activesupport (= 6.1.4.7)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
+      rake (>= 0.13)
+      thor (~> 1.0)
     rainbow (3.0.0)
     raindrops (0.20.0)
     rake (13.0.6)
@@ -830,19 +847,19 @@ GEM
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
     thor (1.2.1)
-    thread_safe (0.3.6)
     thwait (0.2.0)
       e2mmap
     tilt (2.0.10)
     timecop (0.8.1)
+    timeout (0.3.2)
     trailblazer-option (0.1.2)
     ttfunk (1.7.0)
     twilio-ruby (5.73.4)
       faraday (>= 0.9, < 3.0)
       jwt (>= 1.5, <= 2.5)
       nokogiri (>= 1.6, < 2.0)
-    tzinfo (1.2.10)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
     uber (0.1.0)
     uglifier (3.0.0)
       execjs (>= 0.3.0, < 3)
@@ -888,7 +905,7 @@ GEM
     xxhash (0.4.0)
     youtube-dl.rb (0.3.1.2016.08.19)
       cocaine (>= 0.5.4)
-    zeitwerk (2.6.6)
+    zeitwerk (2.6.7)
 
 PLATFORMS
   ruby
@@ -929,7 +946,7 @@ DEPENDENCIES
   chronic (~> 0.10.2)
   cld
   colorize
-  composite_primary_keys (~> 12.0)
+  composite_primary_keys (~> 13.0)
   crowdin-api (~> 1.2.1)
   cucumber
   daemons
@@ -1013,7 +1030,7 @@ DEPENDENCIES
   rack-mini-profiler
   rack-ssl-enforcer
   rack_csrf
-  rails (= 6.0.6)
+  rails (= 6.1.4.7)
   rails-controller-testing (~> 1.0.5)
   raindrops
   rambling-trie (>= 2.1.1)

dashboard/app/controllers/levels_controller.rb

@@ -534,7 +534,7 @@ def embed_level
     # Reference links should be stored as an array.
     if params[:level][:reference_links].is_a? String
       params[:level][:reference_links] = params[:level][:reference_links].split("\r\n")
-      params[:level][:reference_links].delete_if(&:blank?)
+      params[:level][:reference_links].compact_blank!
     end
 
     permitted_params.concat(Level.permitted_params)

dashboard/app/models/concerns/pd/form.rb

@@ -135,9 +135,7 @@ def sanitized_and_trimmed_form_data_hash
     # empty fields may come about when the user selects then unselects an
     # option. They should be treated as if they do not exist
     @sanitized_and_trimmed_form_data_hash ||=
-      sanitized_form_data_hash.reject do |_, value|
-        value.blank?
-      end
+      sanitized_form_data_hash.compact_blank
   end
 
   def public_sanitized_form_data_hash

dashboard/config/initializers/no_transform_paths.rb

@@ -9,8 +9,8 @@ module NoTransformPaths
       /craft/
     ).freeze
 
-    def serve(request)
-      status, headers, body = super(request)
+    def serve(request, filepath, content_headers)
+      status, headers, body = super(request, filepath, content_headers)
       new_headers = filter_headers(request.path_info, headers)
       return [status, new_headers, body]
     end