Merge pull request #895 from uktrade/develop

Release version with updated gems for Actionpack
uktrade · Aug 10, 2023 · d193bfd · d193bfd
2 parents 871e8ba + 84c79c4
commit d193bfd
Show file tree

Hide file tree

Showing 54 changed files with 74 additions and 72 deletions.
diff --git a/Gemfile b/Gemfile
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 ruby '2.7.7'
 
-gem 'rails', '6.1.7.3'
+gem 'rails', '6.1.7.4'
 gem 'bundler'
 gem 'puma', '5.6.4'
 gem 'pg', '1.1.4'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,64 +1,64 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actioncable (6.1.7.4)
+      actionpack (= 6.1.7.4)
+      activesupport (= 6.1.7.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activejob (= 6.1.7.3)
-      activerecord (= 6.1.7.3)
-      activestorage (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actionmailbox (6.1.7.4)
+      actionpack (= 6.1.7.4)
+      activejob (= 6.1.7.4)
+      activerecord (= 6.1.7.4)
+      activestorage (= 6.1.7.4)
+      activesupport (= 6.1.7.4)
       mail (>= 2.7.1)
-    actionmailer (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      actionview (= 6.1.7.3)
-      activejob (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actionmailer (6.1.7.4)
+      actionpack (= 6.1.7.4)
+      actionview (= 6.1.7.4)
+      activejob (= 6.1.7.4)
+      activesupport (= 6.1.7.4)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.7.3)
-      actionview (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actionpack (6.1.7.4)
+      actionview (= 6.1.7.4)
+      activesupport (= 6.1.7.4)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
     actionpack-page_caching (1.2.4)
       actionpack (>= 4.0.0)
-    actiontext (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activerecord (= 6.1.7.3)
-      activestorage (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actiontext (6.1.7.4)
+      actionpack (= 6.1.7.4)
+      activerecord (= 6.1.7.4)
+      activestorage (= 6.1.7.4)
+      activesupport (= 6.1.7.4)
       nokogiri (>= 1.8.5)
-    actionview (6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actionview (6.1.7.4)
+      activesupport (= 6.1.7.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
     active_record_union (1.3.0)
       activerecord (>= 4.0)
-    activejob (6.1.7.3)
-      activesupport (= 6.1.7.3)
+    activejob (6.1.7.4)
+      activesupport (= 6.1.7.4)
       globalid (>= 0.3.6)
-    activemodel (6.1.7.3)
-      activesupport (= 6.1.7.3)
-    activerecord (6.1.7.3)
-      activemodel (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
-    activestorage (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activejob (= 6.1.7.3)
-      activerecord (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    activemodel (6.1.7.4)
+      activesupport (= 6.1.7.4)
+    activerecord (6.1.7.4)
+      activemodel (= 6.1.7.4)
+      activesupport (= 6.1.7.4)
+    activestorage (6.1.7.4)
+      actionpack (= 6.1.7.4)
+      activejob (= 6.1.7.4)
+      activerecord (= 6.1.7.4)
+      activesupport (= 6.1.7.4)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.7.3)
+    activesupport (6.1.7.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -1578,7 +1578,7 @@ GEM
     http-accept (1.7.0)
     http-cookie (1.0.5)
       domain_name (~> 0.5)
-    i18n (1.13.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     immutable-struct (2.4.1)
     interception (0.5)
@@ -1609,9 +1609,9 @@ GEM
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.20.0)
+    loofah (2.21.3)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
+      nokogiri (>= 1.12.0)
     mail (2.8.1)
       mini_mime (>= 0.1.1)
       net-imap
@@ -1624,8 +1624,8 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.0218.1)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.2)
-    minitest (5.18.0)
+    mini_portile2 (2.8.4)
+    minitest (5.19.0)
     mock_redis (0.36.0)
       ruby2_keywords
     multi_json (1.15.0)
@@ -1634,7 +1634,7 @@ GEM
     neat (1.7.4)
       bourbon (>= 4.0)
       sass (>= 3.3)
-    net-imap (0.3.4)
+    net-imap (0.3.7)
       date
       net-protocol
     net-pop (0.1.2)
@@ -1645,8 +1645,8 @@ GEM
       net-protocol
     netrc (0.11.0)
     nio4r (2.5.9)
-    nokogiri (1.14.3)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.15.3)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     normalize-scss (7.0.1)
       sass (~> 3.3)
@@ -1715,38 +1715,40 @@ GEM
       rspec-rails (>= 3.0.0)
     raabro (1.4.0)
     racc (1.7.1)
-    rack (2.2.7)
+    rack (2.2.8)
     rack-protection (3.0.6)
       rack
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (6.1.7.3)
-      actioncable (= 6.1.7.3)
-      actionmailbox (= 6.1.7.3)
-      actionmailer (= 6.1.7.3)
-      actionpack (= 6.1.7.3)
-      actiontext (= 6.1.7.3)
-      actionview (= 6.1.7.3)
-      activejob (= 6.1.7.3)
-      activemodel (= 6.1.7.3)
-      activerecord (= 6.1.7.3)
-      activestorage (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    rails (6.1.7.4)
+      actioncable (= 6.1.7.4)
+      actionmailbox (= 6.1.7.4)
+      actionmailer (= 6.1.7.4)
+      actionpack (= 6.1.7.4)
+      actiontext (= 6.1.7.4)
+      actionview (= 6.1.7.4)
+      activejob (= 6.1.7.4)
+      activemodel (= 6.1.7.4)
+      activerecord (= 6.1.7.4)
+      activestorage (= 6.1.7.4)
+      activesupport (= 6.1.7.4)
       bundler (>= 1.15.0)
-      railties (= 6.1.7.3)
+      railties (= 6.1.7.4)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
       activesupport (>= 5.0.1.rc1)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    rails-dom-testing (2.1.1)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.5.0)
-      loofah (~> 2.19, >= 2.19.1)
-    railties (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    railties (6.1.7.4)
+      actionpack (= 6.1.7.4)
+      activesupport (= 6.1.7.4)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -1870,10 +1872,10 @@ GEM
     stringex (2.8.6)
     stringio (3.0.6)
     temple (0.10.0)
-    thor (1.2.1)
+    thor (1.2.2)
     tilt (2.1.0)
     timecop (0.9.6)
-    timeout (0.3.2)
+    timeout (0.4.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uglifier (4.2.0)
@@ -1896,13 +1898,13 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    websocket-driver (0.7.5)
+    websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
     yajl-ruby (1.4.3)
-    zeitwerk (2.6.7)
+    zeitwerk (2.6.10)
 
 PLATFORMS
   ruby
@@ -1968,7 +1970,7 @@ DEPENDENCIES
   puma (= 5.6.4)
   pundit
   pundit-matchers
-  rails (= 6.1.7.3)
+  rails (= 6.1.7.4)
   rails-controller-testing
   redis (= 4.8.1)
   redis-namespace (= 1.10.0)

diff --git a/vendor/cache/actioncable-6.1.7.3.gem b/vendor/cache/actioncable-6.1.7.3.gem
diff --git a/vendor/cache/actioncable-6.1.7.4.gem b/vendor/cache/actioncable-6.1.7.4.gem
diff --git a/vendor/cache/actionmailbox-6.1.7.3.gem b/vendor/cache/actionmailbox-6.1.7.3.gem
diff --git a/vendor/cache/actionmailbox-6.1.7.4.gem b/vendor/cache/actionmailbox-6.1.7.4.gem
diff --git a/vendor/cache/actionmailer-6.1.7.3.gem b/vendor/cache/actionmailer-6.1.7.3.gem
diff --git a/vendor/cache/actionmailer-6.1.7.4.gem b/vendor/cache/actionmailer-6.1.7.4.gem
diff --git a/vendor/cache/actionpack-6.1.7.3.gem b/vendor/cache/actionpack-6.1.7.3.gem
diff --git a/vendor/cache/actionpack-6.1.7.4.gem b/vendor/cache/actionpack-6.1.7.4.gem
diff --git a/vendor/cache/actiontext-6.1.7.3.gem b/vendor/cache/actiontext-6.1.7.3.gem
diff --git a/vendor/cache/actiontext-6.1.7.4.gem b/vendor/cache/actiontext-6.1.7.4.gem
diff --git a/vendor/cache/actionview-6.1.7.3.gem b/vendor/cache/actionview-6.1.7.3.gem
diff --git a/vendor/cache/actionview-6.1.7.4.gem b/vendor/cache/actionview-6.1.7.4.gem
diff --git a/vendor/cache/activejob-6.1.7.3.gem b/vendor/cache/activejob-6.1.7.3.gem
diff --git a/vendor/cache/activejob-6.1.7.4.gem b/vendor/cache/activejob-6.1.7.4.gem
diff --git a/vendor/cache/activemodel-6.1.7.3.gem b/vendor/cache/activemodel-6.1.7.3.gem
diff --git a/vendor/cache/activemodel-6.1.7.4.gem b/vendor/cache/activemodel-6.1.7.4.gem
diff --git a/vendor/cache/activerecord-6.1.7.3.gem b/vendor/cache/activerecord-6.1.7.3.gem
diff --git a/vendor/cache/activerecord-6.1.7.4.gem b/vendor/cache/activerecord-6.1.7.4.gem
diff --git a/vendor/cache/activestorage-6.1.7.3.gem b/vendor/cache/activestorage-6.1.7.3.gem
diff --git a/vendor/cache/activestorage-6.1.7.4.gem b/vendor/cache/activestorage-6.1.7.4.gem
diff --git a/vendor/cache/activesupport-6.1.7.3.gem b/vendor/cache/activesupport-6.1.7.3.gem
diff --git a/vendor/cache/activesupport-6.1.7.4.gem b/vendor/cache/activesupport-6.1.7.4.gem
diff --git a/vendor/cache/i18n-1.13.0.gem b/vendor/cache/i18n-1.13.0.gem
diff --git a/vendor/cache/i18n-1.14.1.gem b/vendor/cache/i18n-1.14.1.gem
diff --git a/vendor/cache/loofah-2.20.0.gem b/vendor/cache/loofah-2.20.0.gem
diff --git a/vendor/cache/loofah-2.21.3.gem b/vendor/cache/loofah-2.21.3.gem
diff --git a/vendor/cache/mini_portile2-2.8.2.gem b/vendor/cache/mini_portile2-2.8.2.gem
diff --git a/vendor/cache/mini_portile2-2.8.4.gem b/vendor/cache/mini_portile2-2.8.4.gem
diff --git a/vendor/cache/minitest-5.18.0.gem b/vendor/cache/minitest-5.18.0.gem
diff --git a/vendor/cache/minitest-5.19.0.gem b/vendor/cache/minitest-5.19.0.gem
diff --git a/vendor/cache/net-imap-0.3.4.gem b/vendor/cache/net-imap-0.3.4.gem
diff --git a/vendor/cache/net-imap-0.3.7.gem b/vendor/cache/net-imap-0.3.7.gem
diff --git a/vendor/cache/nokogiri-1.14.3.gem b/vendor/cache/nokogiri-1.14.3.gem
diff --git a/vendor/cache/nokogiri-1.15.3.gem b/vendor/cache/nokogiri-1.15.3.gem
diff --git a/vendor/cache/rack-2.2.7.gem b/vendor/cache/rack-2.2.7.gem
diff --git a/vendor/cache/rack-2.2.8.gem b/vendor/cache/rack-2.2.8.gem
diff --git a/vendor/cache/rails-6.1.7.3.gem b/vendor/cache/rails-6.1.7.3.gem
diff --git a/vendor/cache/rails-6.1.7.4.gem b/vendor/cache/rails-6.1.7.4.gem
diff --git a/vendor/cache/rails-dom-testing-2.0.3.gem b/vendor/cache/rails-dom-testing-2.0.3.gem
diff --git a/vendor/cache/rails-dom-testing-2.1.1.gem b/vendor/cache/rails-dom-testing-2.1.1.gem
diff --git a/vendor/cache/rails-html-sanitizer-1.5.0.gem b/vendor/cache/rails-html-sanitizer-1.5.0.gem
diff --git a/vendor/cache/rails-html-sanitizer-1.6.0.gem b/vendor/cache/rails-html-sanitizer-1.6.0.gem
diff --git a/vendor/cache/railties-6.1.7.3.gem b/vendor/cache/railties-6.1.7.3.gem
diff --git a/vendor/cache/railties-6.1.7.4.gem b/vendor/cache/railties-6.1.7.4.gem
diff --git a/vendor/cache/thor-1.2.1.gem b/vendor/cache/thor-1.2.1.gem
diff --git a/vendor/cache/thor-1.2.2.gem b/vendor/cache/thor-1.2.2.gem
diff --git a/vendor/cache/timeout-0.3.2.gem b/vendor/cache/timeout-0.3.2.gem
diff --git a/vendor/cache/timeout-0.4.0.gem b/vendor/cache/timeout-0.4.0.gem
diff --git a/vendor/cache/websocket-driver-0.7.5.gem b/vendor/cache/websocket-driver-0.7.5.gem
diff --git a/vendor/cache/websocket-driver-0.7.6.gem b/vendor/cache/websocket-driver-0.7.6.gem
diff --git a/vendor/cache/zeitwerk-2.6.10.gem b/vendor/cache/zeitwerk-2.6.10.gem
diff --git a/vendor/cache/zeitwerk-2.6.7.gem b/vendor/cache/zeitwerk-2.6.7.gem