Merge pull request #2613 from bitzesty/main-staging-conflicts-resolved

Staging release

.env.example

@@ -14,7 +14,7 @@ SENDGRID_USERNAME=test_smtp_username
 SENDGRID_PASSWORD=test_smtp_password
 AWS_ACCESS_KEY_ID=xxx
 AWS_SECRET_ACCESS_KEY=xxx
-AWS_REGION=xxx                          
+AWS_REGION=xxx
 AWS_S3_BUCKET_NAME=xxx
 DISPLAY_SOCIAL_MOBILITY_AWARD=true
 PUSHER_SOCKET_HOST=localhost
@@ -24,4 +24,5 @@ PUSHER_APP_KEY=app_key
 PUSHER_SECRET=secret
 DEBOUNCE_API_KEY=test
 GOV_UK_NOTIFY_API_KEY=key
-GOV_UK_NOTIFY_API_TEMPLATE_ID=id
+GOV_UK_NOTIFY_API_TEMPLATE_ID=id
+SESSION_TIMEOUT=1

.github/workflows/ci.yml

@@ -42,7 +42,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7.7
+          ruby-version: 3.2.2
       - uses: actions/setup-node@v2-beta
         with:
           node-version: '16'
@@ -54,14 +54,13 @@ jobs:
         env:
           DISPLAY_SOCIAL_MOBILITY_AWARD: true
           DATABASE_URL: 'postgresql://postgres:postgres@localhost:5432/qae_test'
-          BUNDLER_VERSION: 2.4.8
+          BUNDLER_VERSION: 2.4.19
           DOCKER_TLS_CERTDIR: ''
         run: |
           sudo apt update
           sudo apt-get -yqq install postgresql postgresql-client libpq-dev xvfb unzip libcurl4 libcurl3-gnutls libcurl4-openssl-dev
           gem install bundler
           gem update --system && gem update bundler
-          bundle config path vendor/bundle
           yarn install
           bundle install --jobs 4 --retry 3
           RAILS_ENV=test bundle exec rake db:create db:migrate
@@ -83,7 +82,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7.7
+          ruby-version: 3.2.2
       - uses: actions/setup-node@v2-beta
         with:
           node-version: '16'
@@ -124,7 +123,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7.7
+          ruby-version: 3.2.2
       - uses: actions/setup-node@v2-beta
         with:
           node-version: '16'

.github/workflows/deploy_development.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7.7
+          ruby-version: 3.2.2
       - uses: actions/setup-node@v2-beta
         with:
           node-version: "16"

.github/workflows/deploy_production.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7.7
+          ruby-version: 3.2.2
       - uses: actions/setup-node@v2-beta
         with:
           node-version: "16"

.github/workflows/deploy_staging.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7.7
+          ruby-version: 3.2.2
       - uses: actions/setup-node@v2-beta
         with:
           node-version: '16'

.ruby-version

@@ -1 +1 @@
-2.7.7
+3.2.2

.tool-versions

@@ -0,0 +1,2 @@
+ruby 3.2.2
+nodejs 18.17.1

Dockerfile.local

@@ -1,6 +1,6 @@
-ARG RUBY_VERSION=2.7.7
+ARG RUBY_VERSION=3.2.2
 
-FROM ruby:2.7.7
+FROM ruby:3.2.2
 
 ENV HOME=/app
 WORKDIR /app
@@ -18,7 +18,7 @@ COPY Gemfile /app/Gemfile
 COPY Gemfile.lock /app/Gemfile.lock
 RUN bundle config set --local path 'vendor/bundle'
 RUN bundle config set --local without 'development test'
-RUN gem install bundler:2.4.8 && bundle install --jobs 4 --retry 3
+RUN gem install bundler:2.4.19 && bundle install --jobs 4 --retry 3
 
 COPY . /app
 RUN yarn install

Gemfile

@@ -2,9 +2,9 @@ source 'https://rubygems.org'
 
 git_source(:github) { |name| "https://github.com/#{name}.git" }
 
-ruby '~> 2.7.7'
+ruby '~> 3.2.2'
 
-gem 'rails', '6.1.7.3'
+gem 'rails', '7.0.5.1'
 gem 'websocket-extensions', '~> 0.1.5'
 
 # SSL redirect
@@ -14,12 +14,13 @@ gem 'rack-ssl-enforcer'
 gem 'pg'
 
 # Track Changes
-gem 'paper_trail', '~> 10.3'
+gem 'paper_trail', '~> 12.2.0'
+gem 'paper_trail-association_tracking'
 
 # Assets & Templates
 gem 'sprockets', '~> 3.7.2'
 gem 'sprockets-rails', '>= 2.0.0'
-gem 'sassc-rails', '~> 2.0.0'
+gem 'sassc-rails', '~> 2.1.2'
 gem 'slim-rails', '~> 3.2.0'
 gem 'coffee-rails', '5.0'
 gem 'jquery-rails', '4.4.0'
@@ -29,15 +30,14 @@ gem 'govuk-components'
 gem 'uglifier', '>= 2.7.2'
 gem 'js_cookie_rails', '2.1.4'
 gem 'ckeditor'
-gem 'webpacker', '6.0.0.beta.7'
+gem 'webpacker', '6.0.0.rc.6'
 
 # Autolinking in admin mass user mailer
 gem 'rails_autolink'
 
 # Decorators & Exposing named methods
 gem 'draper', '~> 4.0'
 gem 'decent_exposure'
-gem 'decent_decoration'
 
 gem 'hashie', '~> 3.5'
 
@@ -48,7 +48,7 @@ gem 'responders', '~> 3.0'
 gem 'rails-html-sanitizer', '~> 1.4.4'
 
 # JSON
-gem 'json', '2.3.0'
+gem 'json'
 gem 'jbuilder', '~> 2.10.1'
 gem 'gon', '>= 6.4.0'
 
@@ -87,7 +87,6 @@ gem 'nokogiri'
 
 # Uploads
 gem 'carrierwave', '~> 1.3'
-gem 'fog', "1.42.1"
 gem "fog-aws"
 gem 'vigilion', '~> 1.0.4'
 gem 'vigilion-rails', '~> 2.2.0'
@@ -126,7 +125,7 @@ gem 'nilify_blanks'
 gem 'curb', '0.9.10'
 
 # Web server
-gem 'puma', '~> 4.3.12'
+gem 'puma', '~> 6.3.1'
 
 # Performance & Error reporting
 gem 'appsignal'
@@ -144,6 +143,8 @@ gem 'shog'
 
 gem 'rails-healthcheck'
 
+gem 'matrix'
+
 # Used to convert HTML to text, with the exception of whitelisted attributes.
 # This makes it easier for us to display HTML content within PDF documents.
 gem 'sanitize'
@@ -179,7 +180,7 @@ end
 
 group :test do
   gem 'factory_bot_rails'
-  gem 'capybara', '3.33'
+  gem 'capybara', '~> 3.39.0'
   gem 'poltergeist'
   gem 'database_cleaner-active_record'
   gem 'launchy'
@@ -189,6 +190,6 @@ group :test do
   gem 'codeclimate_circle_ci_coverage'
   gem 'rspec_junit_formatter', '0.2.3'
   gem 'timecop'
-  gem 'webmock', '3.5.0'
+  gem 'webmock', '3.18.1'
   gem 'rspec-sidekiq'
 end