Merge branch 'main' into dependabot/bundler/rgeo-activerecord-8.0.0

CHANGELOG.md

@@ -96,6 +96,36 @@
 
 **Merged pull requests:**
 
+- Bump net-imap from 0.4.14 to 0.4.15 [\#836](https://github.com/DEFRA/flood-risk-engine/pull/836) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump rexml from 3.3.5 to 3.3.6 [\#833](https://github.com/DEFRA/flood-risk-engine/pull/833) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump vcr from 6.2.0 to 6.3.1 [\#832](https://github.com/DEFRA/flood-risk-engine/pull/832) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump shoulda-matchers from 6.2.0 to 6.4.0 [\#830](https://github.com/DEFRA/flood-risk-engine/pull/830) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump rspec-rails from 6.1.3 to 6.1.4 [\#829](https://github.com/DEFRA/flood-risk-engine/pull/829) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump govuk\_design\_system\_formbuilder from 5.4.1 to 5.5.0 [\#827](https://github.com/DEFRA/flood-risk-engine/pull/827) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump rubocop from 1.65.0 to 1.65.1 [\#823](https://github.com/DEFRA/flood-risk-engine/pull/823) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump notifications-ruby-client from 6.1.0 to 6.2.0 [\#821](https://github.com/DEFRA/flood-risk-engine/pull/821) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump pg from 1.5.6 to 1.5.7 [\#820](https://github.com/DEFRA/flood-risk-engine/pull/820) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump nokogiri from 1.16.6 to 1.16.7 [\#819](https://github.com/DEFRA/flood-risk-engine/pull/819) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump rexml from 3.3.1 to 3.3.2 [\#818](https://github.com/DEFRA/flood-risk-engine/pull/818) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump rgeo-geojson from 2.1.1 to 2.2.0 [\#817](https://github.com/DEFRA/flood-risk-engine/pull/817) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump govuk\_design\_system\_formbuilder from 5.4.0 to 5.4.1 [\#816](https://github.com/DEFRA/flood-risk-engine/pull/816) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump phonelib from 0.8.9 to 0.9.1 [\#815](https://github.com/DEFRA/flood-risk-engine/pull/815) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump bullet from 7.1.6 to 7.2.0 [\#814](https://github.com/DEFRA/flood-risk-engine/pull/814) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump rubocop from 1.64.1 to 1.65.0 [\#812](https://github.com/DEFRA/flood-risk-engine/pull/812) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump phonelib from 0.8.8 to 0.8.9 [\#810](https://github.com/DEFRA/flood-risk-engine/pull/810) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump webmock from 3.23.0 to 3.23.1 [\#809](https://github.com/DEFRA/flood-risk-engine/pull/809) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump rspec-rails from 6.1.2 to 6.1.3 [\#808](https://github.com/DEFRA/flood-risk-engine/pull/808) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump rubocop-rails from 2.24.1 to 2.25.1 [\#807](https://github.com/DEFRA/flood-risk-engine/pull/807) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump net-imap from 0.4.10 to 0.4.14 [\#806](https://github.com/DEFRA/flood-risk-engine/pull/806) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump nokogiri from 1.16.4 to 1.16.6 [\#804](https://github.com/DEFRA/flood-risk-engine/pull/804) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump rails from 7.1.3.2 to 7.1.3.4 [\#801](https://github.com/DEFRA/flood-risk-engine/pull/801) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump rubocop from 1.63.4 to 1.64.1 [\#796](https://github.com/DEFRA/flood-risk-engine/pull/796) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump notifications-ruby-client from 6.0.0 to 6.1.0 [\#793](https://github.com/DEFRA/flood-risk-engine/pull/793) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Update CHANGELOG [\#792](https://github.com/DEFRA/flood-risk-engine/pull/792) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Bump govuk\_design\_system\_formbuilder from 5.3.3 to 5.4.0 [\#791](https://github.com/DEFRA/flood-risk-engine/pull/791) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump rexml from 3.2.6 to 3.2.8 [\#788](https://github.com/DEFRA/flood-risk-engine/pull/788) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump nokogiri from 1.16.4 to 1.16.5 [\#787](https://github.com/DEFRA/flood-risk-engine/pull/787) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump activerecord-postgis-adapter from 9.0.1 to 9.0.2 [\#783](https://github.com/DEFRA/flood-risk-engine/pull/783) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Cleanup [\#781](https://github.com/DEFRA/flood-risk-engine/pull/781) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
 - Bump faraday-retry from 2.2.0 to 2.2.1 [\#777](https://github.com/DEFRA/flood-risk-engine/pull/777) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump govuk\_design\_system\_formbuilder from 5.2.0 to 5.3.3 [\#776](https://github.com/DEFRA/flood-risk-engine/pull/776) ([dependabot[bot]](https://github.com/apps/dependabot))

Gemfile

@@ -32,8 +32,10 @@ group :development, :test do
   gem "github_changelog_generator"
   # Used to ensure the code base matches our agreed styles and conventions
   gem "rubocop"
+  gem "rubocop-capybara"
   gem "rubocop-rails"
   gem "rubocop-rspec"
+  gem "rubocop-rspec_rails"
   gem "sass-rails", "~> 5"
 end