Merge pull request #595 from Crown-Commercial-Service/merge-develop-i…

…nto-staging

Merge develop into staging

.rubocop.yml

@@ -2,6 +2,7 @@ require:
   - rubocop-performance
   - rubocop-rails
   - rubocop-rspec # or rubocop-minitest
+  - rubocop-factory_bot
 AllCops:
   NewCops: enable
   Exclude:
@@ -76,7 +77,7 @@ Metrics/AbcSize:
 Layout/LineLength:
     Max: 120
     Enabled: false
-    IgnoredPatterns:
+    AllowedPatterns:
         - 'it .* do$'
         - 'context .* do$'
         - 'scenario .* do$'

.travis.yml

@@ -1,7 +1,7 @@
 dist: bionic
 language: ruby
 rvm:
- — 2.7.2
+ — 3.2.2
 env:
   matrix:
     - API_ROOT=$deploy_api_uri

CF/manifest-template.yml

@@ -3,7 +3,7 @@ applications:
 - name: conclave-cii-CF_SPACE
   memory: SET_MEMORY
   buildpacks:
-    - https://github.com/cloudfoundry/ruby-buildpack.git#v1.8.42
+    - https://github.com/cloudfoundry/ruby-buildpack.git#v1.10.0
   instances: 1
   random-route: true
   routes:

Gemfile

@@ -1,10 +1,10 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.7.2'
+ruby '3.2.2'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 6.0.6'
+gem 'rails', '~> 7.0.5'
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3', '~> 1.4'
 # Use Puma as the app server
@@ -21,7 +21,7 @@ gem 'puma', '~> 4.3', '>= 4.3.12'
 gem 'bootsnap', '>= 1.4.2', require: false
 # for postgresql
 gem 'activerecord-postgis-adapter', '>= 6.0.1'
-gem 'pg', '~> 0.18.4'
+gem 'pg'
 gem 'jwt'
 gem 'faraday'
 gem 'faraday_middleware'