Merge pull request #3312 from Crown-Commercial-Service/release-4.5.4

PRODUCTION - Release 4.5.4

.gitignore

@@ -72,3 +72,6 @@ launch.json
 
 # We are using yarn not npm, but this file sometimes gets added by snyk which brakes the pipeline
 package-lock.json
+
+# We will compile the typescript as part of the assets pipeline
+app/assets/javascripts/dist/*

Dockerfile

@@ -105,7 +105,7 @@ RUN bundle install
 
 # Install Node.js dependencies
 COPY package.json yarn.lock ./
-RUN yarn install --frozen-lockfile --production --no-cache
+RUN yarn install --frozen-lockfile --production --no-cache --ignore-scripts
 
 COPY . .
 

Gemfile

@@ -4,7 +4,7 @@ git_source(:github) { |repo| "https:/#{repo}.git" }
 ruby '2.7.6'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 6.0.5', '>= 6.0.5.1'
+gem 'rails', '~> 6.0.6'
 # Use postgresql as the database for Active Record
 gem 'pg', '>= 0.18', '< 2.0'
 # Use Puma as the app server
@@ -52,7 +52,7 @@ gem 'devise', '~> 4.8.1'
 gem 'auto-session-timeout', '~> 0.9.9'
 
 # for cognito
-gem 'aws-sdk-cognitoidentityprovider', '~> 1.69.0'
+gem 'aws-sdk-cognitoidentityprovider', '~> 1.70.0'
 
 # for pagination
 gem 'kaminari', '~> 1.2.2'
@@ -127,7 +127,7 @@ group :development, :test do
  gem 'wdm', '>= 0.1.0', platforms: %i[x64_mingw]
  gem 'tzinfo-data', platforms: %i[x64_mingw]
  gem 'bullet', require: true
- gem 'faker', '~> 2.22.0'
+ gem 'faker', '~> 2.23.0'
 end
 
 group :development do

Gemfile.lock

@@ -3,38 +3,38 @@ GEM
  specs:
  aasm (5.3.0)
  concurrent-ruby (~> 1.0)
- actioncable (6.0.5.1)
- actionpack (= 6.0.5.1)
+ actioncable (6.0.6)
+ actionpack (= 6.0.6)
  nio4r (~> 2.0)
  websocket-driver (>= 0.6.1)
- actionmailbox (6.0.5.1)
- actionpack (= 6.0.5.1)
- activejob (= 6.0.5.1)
- activerecord (= 6.0.5.1)
- activestorage (= 6.0.5.1)
- activesupport (= 6.0.5.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)
  mail (>= 2.7.1)
- actionmailer (6.0.5.1)
- actionpack (= 6.0.5.1)
- actionview (= 6.0.5.1)
- activejob (= 6.0.5.1)
+ actionmailer (6.0.6)
+ actionpack (= 6.0.6)
+ actionview (= 6.0.6)
+ activejob (= 6.0.6)
  mail (~> 2.5, >= 2.5.4)
  rails-dom-testing (~> 2.0)
- actionpack (6.0.5.1)
- actionview (= 6.0.5.1)
- activesupport (= 6.0.5.1)
+ actionpack (6.0.6)
+ actionview (= 6.0.6)
+ activesupport (= 6.0.6)
  rack (~> 2.0, >= 2.0.8)
  rack-test (>= 0.6.3)
  rails-dom-testing (~> 2.0)
  rails-html-sanitizer (~> 1.0, >= 1.2.0)
- actiontext (6.0.5.1)
- actionpack (= 6.0.5.1)
- activerecord (= 6.0.5.1)
- activestorage (= 6.0.5.1)
- activesupport (= 6.0.5.1)
+ actiontext (6.0.6)
+ actionpack (= 6.0.6)
+ activerecord (= 6.0.6)
+ activestorage (= 6.0.6)
+ activesupport (= 6.0.6)
  nokogiri (>= 1.8.5)
- actionview (6.0.5.1)
- activesupport (= 6.0.5.1)
+ actionview (6.0.6)
+ activesupport (= 6.0.6)
  builder (~> 3.1)
  erubi (~> 1.4)
  rails-dom-testing (~> 2.0)
@@ -44,38 +44,38 @@ GEM
  activemodel (>= 5.2.0)
  activestorage (>= 5.2.0)
  activesupport (>= 5.2.0)
- activejob (6.0.5.1)
- activesupport (= 6.0.5.1)
+ activejob (6.0.6)
+ activesupport (= 6.0.6)
  globalid (>= 0.3.6)
- activemodel (6.0.5.1)
- activesupport (= 6.0.5.1)
- activerecord (6.0.5.1)
- activemodel (= 6.0.5.1)
- activesupport (= 6.0.5.1)
+ activemodel (6.0.6)
+ activesupport (= 6.0.6)
+ activerecord (6.0.6)
+ activemodel (= 6.0.6)
+ activesupport (= 6.0.6)
  activerecord-import (1.4.0)
  activerecord (>= 4.2)
  activerecord-postgis-adapter (6.0.3)
  activerecord (~> 6.0.0)
  rgeo-activerecord (~> 6.0)
- activestorage (6.0.5.1)
- actionpack (= 6.0.5.1)
- activejob (= 6.0.5.1)
- activerecord (= 6.0.5.1)
+ activestorage (6.0.6)
+ actionpack (= 6.0.6)
+ activejob (= 6.0.6)
+ activerecord (= 6.0.6)
  marcel (~> 1.0)
- activesupport (6.0.5.1)
+ activesupport (6.0.6)
  concurrent-ruby (~> 1.0, >= 1.0.2)
  i18n (>= 0.7, < 2)
  minitest (~> 5.1)
  tzinfo (~> 1.1)
  zeitwerk (~> 2.2, >= 2.2.2)
- addressable (2.8.0)
- public_suffix (>= 2.0.2, < 5.0)
+ addressable (2.8.1)
+ public_suffix (>= 2.0.2, < 6.0)
  after_commit_everywhere (1.2.2)
  activerecord (>= 4.2)
  activesupport
  amoeba (3.2.0)
  activerecord (>= 4.2.0)
- asset_sync (2.15.2)
+ asset_sync (2.16.0)
  activemodel (>= 4.1.0)
  fog-core
  mime-types (>= 2.99)
@@ -84,11 +84,11 @@ GEM
  auto-session-timeout (0.9.9)
  actionpack (>= 3.2, < 7.1)
  aws-eventstream (1.2.0)
- aws-partitions (1.620.0)
- aws-sdk-cognitoidentityprovider (1.69.0)
+ aws-partitions (1.628.0)
+ aws-sdk-cognitoidentityprovider (1.70.0)
  aws-sdk-core (~> 3, >= 3.127.0)
  aws-sigv4 (~> 1.1)
- aws-sdk-core (3.132.0)
+ aws-sdk-core (3.144.0)
  aws-eventstream (~> 1, >= 1.0.2)
  aws-partitions (~> 1, >= 1.525.0)
  aws-sigv4 (~> 1.1)
@@ -236,14 +236,14 @@ GEM
  email_validator (2.2.3)
  activemodel
  erubi (1.11.0)
- excon (0.92.4)
+ excon (0.92.5)
  execjs (2.7.0)
  factory_bot (6.2.1)
  activesupport (>= 5.0.0)
  factory_bot_rails (6.2.0)
  factory_bot (~> 6.2.0)
  railties (>= 5.0.0)
- faker (2.22.0)
+ faker (2.23.0)
  i18n (>= 1.8.11, < 2)
  faraday (2.3.0)
  faraday-net_http (~> 2.0)
@@ -319,7 +319,7 @@ GEM
  listen (3.7.1)
  rb-fsevent (~> 0.10, >= 0.10.3)
  rb-inotify (~> 0.9, >= 0.9.10)
- loofah (2.18.0)
+ loofah (2.19.0)
  crass (~> 1.0.2)
  nokogiri (>= 1.5.9)
  mail (2.7.1)
@@ -384,29 +384,29 @@ GEM
  pry-stack_explorer (0.6.1)
  binding_of_caller (~> 1.0)
  pry (~> 0.13)
- public_suffix (4.0.7)
- puma (5.6.4)
+ public_suffix (5.0.0)
+ puma (5.6.5)
  nio4r (~> 2.0)
  racc (1.6.0)
  rack (2.2.4)
  rack-protection (2.2.2)
  rack
  rack-test (2.0.2)
  rack (>= 1.3)
- rails (6.0.5.1)
- actioncable (= 6.0.5.1)
- actionmailbox (= 6.0.5.1)
- actionmailer (= 6.0.5.1)
- actionpack (= 6.0.5.1)
- actiontext (= 6.0.5.1)
- actionview (= 6.0.5.1)
- activejob (= 6.0.5.1)
- activemodel (= 6.0.5.1)
- activerecord (= 6.0.5.1)
- activestorage (= 6.0.5.1)
- activesupport (= 6.0.5.1)
+ 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.5.1)
+ railties (= 6.0.6)
  sprockets-rails (>= 2.0.0)
  rails-controller-testing (1.0.5)
  actionpack (>= 5.0.1.rc1)
@@ -420,9 +420,9 @@ GEM
  rails-i18n (7.0.5)
  i18n (>= 0.7, < 2)
  railties (>= 6.0.0, < 8)
- railties (6.0.5.1)
- actionpack (= 6.0.5.1)
- activesupport (= 6.0.5.1)
+ railties (6.0.6)
+ actionpack (= 6.0.6)
+ activesupport (= 6.0.6)
  method_source
  rake (>= 0.8.7)
  thor (>= 0.20.3, < 2.0)
@@ -468,7 +468,7 @@ GEM
  rspec-mocks (~> 3.10)
  rspec-support (~> 3.10)
  rspec-support (3.11.0)
- rubocop (1.35.1)
+ rubocop (1.36.0)
  json (~> 2.3)
  parallel (~> 1.10)
  parser (>= 3.1.2.1)
@@ -484,8 +484,8 @@ GEM
  activesupport (>= 4.2.0)
  rack (>= 1.1)
  rubocop (>= 1.7.0, < 2.0)
- rubocop-rspec (2.12.1)
- rubocop (~> 1.31)
+ rubocop-rspec (2.13.2)
+ rubocop (~> 1.33)
  ruby-progressbar (1.11.0)
  ruby2_keywords (0.0.5)
  rubyXL (3.4.25)
@@ -568,7 +568,7 @@ GEM
  unf_ext
  unf_ext (0.0.8.2)
  unf_ext (0.0.8.2-x64-mingw32)
- unicode-display_width (2.2.0)
+ unicode-display_width (2.3.0)
  uniform_notifier (1.16.0)
  virtus (2.0.0)
  axiom-types (~> 0.1)
@@ -577,7 +577,7 @@ GEM
  warden (1.2.9)
  rack (>= 2.0.9)
  wdm (0.1.1)
- webmock (3.17.0)
+ webmock (3.18.1)
  addressable (>= 2.8.0)
  crack (>= 0.3.2)
  hashdiff (>= 0.4.0, < 2.0.0)
@@ -603,7 +603,7 @@ DEPENDENCIES
  amoeba (>= 3.2.0)
  asset_sync
  auto-session-timeout (~> 0.9.9)
- aws-sdk-cognitoidentityprovider (~> 1.69.0)
+ aws-sdk-cognitoidentityprovider (~> 1.70.0)
  aws-sdk-s3 (~> 1)
  axe-core-capybara (>= 4.2.1)
  axe-core-cucumber (>= 4.2.1)
@@ -622,7 +622,7 @@ DEPENDENCIES
  dotenv-rails (>= 2.7.6)
  email_validator
  factory_bot_rails (>= 6.2.0)
- faker (~> 2.22.0)
+ faker (~> 2.23.0)
  fog-aws (>= 3.14.0)
  geocoder (>= 1.6.1)
  gov_uk_date_fields (>= 4.2.0)
@@ -642,7 +642,7 @@ DEPENDENCIES
  pry-rescue
  pry-stack_explorer
  puma (~> 5.6)
- rails (~> 6.0.5, >= 6.0.5.1)
+ rails (~> 6.0.6)
  rails-controller-testing (>= 1.0.5)
  ratonvirus (>= 0.3.2)
  ratonvirus-clamby (>= 0.3.0)