Merge pull request #902 from uktrade/develop

UAT/production release
uktrade · Nov 7, 2023 · fbc5945 · fbc5945
2 parents aa62759 + 6785ecb
commit fbc5945
Show file tree

Hide file tree

Showing 47 changed files with 74 additions and 70 deletions.
diff --git a/Gemfile b/Gemfile
@@ -2,11 +2,11 @@ source 'https://rubygems.org'
 
 ruby '2.7.7'
 
-gem 'rails', '6.1.7.4'
+gem 'rails', '6.1.7.5'
 gem 'bundler'
 gem 'puma', '5.6.7'
 gem 'pg', '1.1.4'
-gem 'sidekiq', '6.5.8'
+gem 'sidekiq', '7.1.3'
 gem 'sidekiq-cron', '1.9.1'
 gem 'sidekiq-failures', '1.0.1'
 gem 'redis', '4.8.1'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,64 +1,64 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.7.4)
-      actionpack (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    actioncable (6.1.7.5)
+      actionpack (= 6.1.7.5)
+      activesupport (= 6.1.7.5)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    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)
+    actionmailbox (6.1.7.5)
+      actionpack (= 6.1.7.5)
+      activejob (= 6.1.7.5)
+      activerecord (= 6.1.7.5)
+      activestorage (= 6.1.7.5)
+      activesupport (= 6.1.7.5)
       mail (>= 2.7.1)
-    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)
+    actionmailer (6.1.7.5)
+      actionpack (= 6.1.7.5)
+      actionview (= 6.1.7.5)
+      activejob (= 6.1.7.5)
+      activesupport (= 6.1.7.5)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.7.4)
-      actionview (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    actionpack (6.1.7.5)
+      actionview (= 6.1.7.5)
+      activesupport (= 6.1.7.5)
       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.4)
-      actionpack (= 6.1.7.4)
-      activerecord (= 6.1.7.4)
-      activestorage (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    actiontext (6.1.7.5)
+      actionpack (= 6.1.7.5)
+      activerecord (= 6.1.7.5)
+      activestorage (= 6.1.7.5)
+      activesupport (= 6.1.7.5)
       nokogiri (>= 1.8.5)
-    actionview (6.1.7.4)
-      activesupport (= 6.1.7.4)
+    actionview (6.1.7.5)
+      activesupport (= 6.1.7.5)
       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.4)
-      activesupport (= 6.1.7.4)
+    activejob (6.1.7.5)
+      activesupport (= 6.1.7.5)
       globalid (>= 0.3.6)
-    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)
+    activemodel (6.1.7.5)
+      activesupport (= 6.1.7.5)
+    activerecord (6.1.7.5)
+      activemodel (= 6.1.7.5)
+      activesupport (= 6.1.7.5)
+    activestorage (6.1.7.5)
+      actionpack (= 6.1.7.5)
+      activejob (= 6.1.7.5)
+      activerecord (= 6.1.7.5)
+      activesupport (= 6.1.7.5)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.7.4)
+    activesupport (6.1.7.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -1480,7 +1480,7 @@ GEM
     cliver (0.3.2)
     coderay (1.1.3)
     concurrent-ruby (1.2.2)
-    connection_pool (2.4.0)
+    connection_pool (2.4.1)
     crack (0.4.5)
       rexml
     crass (1.0.6)
@@ -1561,8 +1561,8 @@ GEM
     fuubar (2.5.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
-    globalid (1.1.0)
-      activesupport (>= 5.0)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
     hairtrigger (0.2.23)
       activerecord (>= 5.0, < 7)
       ruby2ruby (~> 2.4)
@@ -1623,9 +1623,9 @@ GEM
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.0218.1)
-    mini_mime (1.1.2)
+    mini_mime (1.1.5)
     mini_portile2 (2.8.4)
-    minitest (5.19.0)
+    minitest (5.20.0)
     mock_redis (0.36.0)
       ruby2_keywords
     multi_json (1.15.0)
@@ -1645,7 +1645,7 @@ GEM
       net-protocol
     netrc (0.11.0)
     nio4r (2.5.9)
-    nokogiri (1.15.3)
+    nokogiri (1.15.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     normalize-scss (7.0.1)
@@ -1720,35 +1720,35 @@ GEM
       rack
     rack-test (2.1.0)
       rack (>= 1.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)
+    rails (6.1.7.5)
+      actioncable (= 6.1.7.5)
+      actionmailbox (= 6.1.7.5)
+      actionmailer (= 6.1.7.5)
+      actionpack (= 6.1.7.5)
+      actiontext (= 6.1.7.5)
+      actionview (= 6.1.7.5)
+      activejob (= 6.1.7.5)
+      activemodel (= 6.1.7.5)
+      activerecord (= 6.1.7.5)
+      activestorage (= 6.1.7.5)
+      activesupport (= 6.1.7.5)
       bundler (>= 1.15.0)
-      railties (= 6.1.7.4)
+      railties (= 6.1.7.5)
       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.1.1)
+    rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
     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)
+    railties (6.1.7.5)
+      actionpack (= 6.1.7.5)
+      activesupport (= 6.1.7.5)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -1760,6 +1760,8 @@ GEM
     rdoc (6.5.0)
       psych (>= 4.0.0)
     redis (4.8.1)
+    redis-client (0.17.0)
+      connection_pool
     redis-namespace (1.10.0)
       redis (>= 4)
     regexp_parser (2.8.0)
@@ -1844,10 +1846,11 @@ GEM
       activesupport (>= 5.2.0)
     show_me_the_cookies (6.0.0)
       capybara (>= 2, < 4)
-    sidekiq (6.5.8)
-      connection_pool (>= 2.2.5, < 3)
-      rack (~> 2.0)
-      redis (>= 4.5.0, < 5)
+    sidekiq (7.1.3)
+      concurrent-ruby (< 2)
+      connection_pool (>= 2.3.0)
+      rack (>= 2.2.4)
+      redis-client (>= 0.14.0)
     sidekiq-cron (1.9.1)
       fugit (~> 1.8)
       sidekiq (>= 4.2.1)
@@ -1862,7 +1865,7 @@ GEM
     spring (4.1.1)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
-    sprockets (4.2.0)
+    sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
     sprockets-rails (3.4.2)
@@ -1904,7 +1907,7 @@ GEM
     xpath (3.2.0)
       nokogiri (~> 1.8)
     yajl-ruby (1.4.3)
-    zeitwerk (2.6.10)
+    zeitwerk (2.6.11)
 
 PLATFORMS
   ruby
@@ -1970,7 +1973,7 @@ DEPENDENCIES
   puma (= 5.6.7)
   pundit
   pundit-matchers
-  rails (= 6.1.7.4)
+  rails (= 6.1.7.5)
   rails-controller-testing
   redis (= 4.8.1)
   redis-namespace (= 1.10.0)
@@ -1989,7 +1992,7 @@ DEPENDENCIES
   sentry-raven (= 3.0.0)
   shoulda-matchers
   show_me_the_cookies (= 6.0.0)
-  sidekiq (= 6.5.8)
+  sidekiq (= 7.1.3)
   sidekiq-cron (= 1.9.1)
   sidekiq-failures (= 1.0.1)
   simplecov

diff --git a/manifest.yml b/manifest.yml
@@ -4,3 +4,4 @@ applications:
       - https://github.com/cloudfoundry/ruby-buildpack.git#v1.8.61
     health-check-type: http
     health-check-http-endpoint: /export-opportunities/check
+    stack: cflinuxfs3
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/actioncable-6.1.7.5.gem b/vendor/cache/actioncable-6.1.7.5.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/actionmailbox-6.1.7.5.gem b/vendor/cache/actionmailbox-6.1.7.5.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/actionmailer-6.1.7.5.gem b/vendor/cache/actionmailer-6.1.7.5.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/actionpack-6.1.7.5.gem b/vendor/cache/actionpack-6.1.7.5.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/actiontext-6.1.7.5.gem b/vendor/cache/actiontext-6.1.7.5.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/actionview-6.1.7.5.gem b/vendor/cache/actionview-6.1.7.5.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/activejob-6.1.7.5.gem b/vendor/cache/activejob-6.1.7.5.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/activemodel-6.1.7.5.gem b/vendor/cache/activemodel-6.1.7.5.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/activerecord-6.1.7.5.gem b/vendor/cache/activerecord-6.1.7.5.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/activestorage-6.1.7.5.gem b/vendor/cache/activestorage-6.1.7.5.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/activesupport-6.1.7.5.gem b/vendor/cache/activesupport-6.1.7.5.gem
diff --git a/vendor/cache/connection_pool-2.4.0.gem b/vendor/cache/connection_pool-2.4.0.gem
diff --git a/vendor/cache/connection_pool-2.4.1.gem b/vendor/cache/connection_pool-2.4.1.gem
diff --git a/vendor/cache/globalid-1.1.0.gem b/vendor/cache/globalid-1.1.0.gem
diff --git a/vendor/cache/globalid-1.2.1.gem b/vendor/cache/globalid-1.2.1.gem
diff --git a/vendor/cache/mini_mime-1.1.2.gem b/vendor/cache/mini_mime-1.1.2.gem
diff --git a/vendor/cache/mini_mime-1.1.5.gem b/vendor/cache/mini_mime-1.1.5.gem
diff --git a/vendor/cache/minitest-5.19.0.gem b/vendor/cache/minitest-5.19.0.gem
diff --git a/vendor/cache/minitest-5.20.0.gem b/vendor/cache/minitest-5.20.0.gem
diff --git a/vendor/cache/nokogiri-1.15.3.gem → vendor/cache/nokogiri-1.15.4.gem b/vendor/cache/nokogiri-1.15.3.gem → vendor/cache/nokogiri-1.15.4.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-6.1.7.5.gem b/vendor/cache/rails-6.1.7.5.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-dom-testing-2.2.0.gem b/vendor/cache/rails-dom-testing-2.2.0.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/railties-6.1.7.5.gem b/vendor/cache/railties-6.1.7.5.gem
diff --git a/vendor/cache/redis-client-0.17.0.gem b/vendor/cache/redis-client-0.17.0.gem
diff --git a/vendor/cache/sidekiq-6.5.8.gem b/vendor/cache/sidekiq-6.5.8.gem
diff --git a/vendor/cache/sidekiq-7.1.3.gem b/vendor/cache/sidekiq-7.1.3.gem
diff --git a/vendor/cache/sprockets-4.2.0.gem b/vendor/cache/sprockets-4.2.0.gem
diff --git a/vendor/cache/sprockets-4.2.1.gem b/vendor/cache/sprockets-4.2.1.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.11.gem b/vendor/cache/zeitwerk-2.6.11.gem