From 3fb5a7505ed051c445071f19a4a47be9d5bb0d05 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Sep 2023 14:03:36 +0100 Subject: [PATCH 1/5] Bump rails from 7.0.5 to 7.0.7 (#667) Bumps [rails](https://github.com/rails/rails) from 7.0.5 to 7.0.7. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v7.0.5...v7.0.7) --- updated-dependencies: - dependency-name: rails dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 133 ++++++++++++++++++++++++++------------------------- 1 file changed, 67 insertions(+), 66 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 591073b6..39683949 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -32,73 +32,73 @@ GEM specs: aasm (5.5.0) concurrent-ruby (~> 1.0) - actioncable (7.0.5) - actionpack (= 7.0.5) - activesupport (= 7.0.5) + actioncable (7.0.7) + actionpack (= 7.0.7) + activesupport (= 7.0.7) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.5) - actionpack (= 7.0.5) - activejob (= 7.0.5) - activerecord (= 7.0.5) - activestorage (= 7.0.5) - activesupport (= 7.0.5) + actionmailbox (7.0.7) + actionpack (= 7.0.7) + activejob (= 7.0.7) + activerecord (= 7.0.7) + activestorage (= 7.0.7) + activesupport (= 7.0.7) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.5) - actionpack (= 7.0.5) - actionview (= 7.0.5) - activejob (= 7.0.5) - activesupport (= 7.0.5) + actionmailer (7.0.7) + actionpack (= 7.0.7) + actionview (= 7.0.7) + activejob (= 7.0.7) + activesupport (= 7.0.7) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.5) - actionview (= 7.0.5) - activesupport (= 7.0.5) + actionpack (7.0.7) + actionview (= 7.0.7) + activesupport (= 7.0.7) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.5) - actionpack (= 7.0.5) - activerecord (= 7.0.5) - activestorage (= 7.0.5) - activesupport (= 7.0.5) + actiontext (7.0.7) + actionpack (= 7.0.7) + activerecord (= 7.0.7) + activestorage (= 7.0.7) + activesupport (= 7.0.7) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.5) - activesupport (= 7.0.5) + actionview (7.0.7) + activesupport (= 7.0.7) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.5) - activesupport (= 7.0.5) + activejob (7.0.7) + activesupport (= 7.0.7) globalid (>= 0.3.6) - activemodel (7.0.5) - activesupport (= 7.0.5) - activerecord (7.0.5) - activemodel (= 7.0.5) - activesupport (= 7.0.5) + activemodel (7.0.7) + activesupport (= 7.0.7) + activerecord (7.0.7) + activemodel (= 7.0.7) + activesupport (= 7.0.7) activerecord-session_store (2.0.0) actionpack (>= 5.2.4.1) activerecord (>= 5.2.4.1) multi_json (~> 1.11, >= 1.11.2) rack (>= 2.0.8, < 3) railties (>= 5.2.4.1) - activestorage (7.0.5) - actionpack (= 7.0.5) - activejob (= 7.0.5) - activerecord (= 7.0.5) - activesupport (= 7.0.5) + activestorage (7.0.7) + actionpack (= 7.0.7) + activejob (= 7.0.7) + activerecord (= 7.0.7) + activesupport (= 7.0.7) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.5) + activesupport (7.0.7) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -258,11 +258,11 @@ GEM mime-types (3.4.1) mime-types-data (~> 3.2015) mime-types-data (3.2023.0218.1) - mini_mime (1.1.2) - mini_portile2 (2.8.2) - minitest (5.18.0) + mini_mime (1.1.5) + mini_portile2 (2.8.4) + minitest (5.19.0) multi_json (1.15.0) - net-imap (0.3.4) + net-imap (0.3.7) date net-protocol net-pop (0.1.2) @@ -273,10 +273,10 @@ GEM net-protocol netrc (0.11.0) nio4r (2.5.9) - nokogiri (1.15.2) + nokogiri (1.15.3) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.15.2-x86_64-linux) + nokogiri (1.15.3-x86_64-linux) racc (~> 1.4) notifications-ruby-client (5.4.0) jwt (>= 1.5, < 3) @@ -301,37 +301,38 @@ GEM protocol-hpack (~> 1.4) protocol-http (~> 0.18) public_suffix (5.0.1) - racc (1.6.2) - rack (2.2.7) + racc (1.7.1) + rack (2.2.8) rack-test (2.1.0) rack (>= 1.3) - rails (7.0.5) - actioncable (= 7.0.5) - actionmailbox (= 7.0.5) - actionmailer (= 7.0.5) - actionpack (= 7.0.5) - actiontext (= 7.0.5) - actionview (= 7.0.5) - activejob (= 7.0.5) - activemodel (= 7.0.5) - activerecord (= 7.0.5) - activestorage (= 7.0.5) - activesupport (= 7.0.5) + rails (7.0.7) + actioncable (= 7.0.7) + actionmailbox (= 7.0.7) + actionmailer (= 7.0.7) + actionpack (= 7.0.7) + actiontext (= 7.0.7) + actionview (= 7.0.7) + activejob (= 7.0.7) + activemodel (= 7.0.7) + activerecord (= 7.0.7) + activestorage (= 7.0.7) + activesupport (= 7.0.7) bundler (>= 1.15.0) - railties (= 7.0.5) + railties (= 7.0.7) 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.0.3) - activesupport (>= 4.2.0) + 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 (7.0.5) - actionpack (= 7.0.5) - activesupport (= 7.0.5) + railties (7.0.7) + actionpack (= 7.0.7) + activesupport (= 7.0.7) method_source rake (>= 12.2) thor (~> 1.0) @@ -433,7 +434,7 @@ GEM concurrent-ruby (~> 1.0) thor (1.2.2) tilt (2.2.0) - timeout (0.3.2) + timeout (0.4.0) timers (4.3.5) traces (0.9.1) tzinfo (2.0.6) @@ -451,12 +452,12 @@ GEM addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - websocket-driver (0.7.5) + websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.8) + zeitwerk (2.6.11) PLATFORMS ruby From e8fe503e0297c0293ef9f5b2f32cad1ff4a3f26c Mon Sep 17 00:00:00 2001 From: PaulDoyle-DEFRA <97455399+PaulDoyle-DEFRA@users.noreply.github.com> Date: Thu, 21 Sep 2023 19:07:15 +0100 Subject: [PATCH 2/5] Update CHANGELOG (#672) https://eaflood.atlassian.net/browse/RUBY-2535 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f496de8..1394aa4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ **Implemented enhancements:** +- RUBY-2480: moving dependency loading from engine to an app [\#642](https://github.com/DEFRA/flood-risk-engine/pull/642) ([brujeo](https://github.com/brujeo)) - Add autocomplete attributes [\#565](https://github.com/DEFRA/flood-risk-engine/pull/565) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA)) - Error page titles [\#558](https://github.com/DEFRA/flood-risk-engine/pull/558) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA)) - Align page titles with H1s [\#557](https://github.com/DEFRA/flood-risk-engine/pull/557) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA)) @@ -88,6 +89,9 @@ **Merged pull requests:** +- Bump rails from 7.0.5 to 7.0.7 [\#667](https://github.com/DEFRA/flood-risk-engine/pull/667) ([dependabot[bot]](https://github.com/apps/dependabot)) +- Feature/ruby 2480 frae tech upgrade to rails 7 [\#641](https://github.com/DEFRA/flood-risk-engine/pull/641) ([brujeo](https://github.com/brujeo)) +- Update CHANGELOG [\#634](https://github.com/DEFRA/flood-risk-engine/pull/634) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA)) - Bump nokogiri from 1.14.3 to 1.15.0 [\#633](https://github.com/DEFRA/flood-risk-engine/pull/633) ([dependabot[bot]](https://github.com/apps/dependabot)) - Bump capybara from 3.39.0 to 3.39.1 [\#631](https://github.com/DEFRA/flood-risk-engine/pull/631) ([dependabot[bot]](https://github.com/apps/dependabot)) - Bump pg from 1.5.0 to 1.5.3 [\#628](https://github.com/DEFRA/flood-risk-engine/pull/628) ([dependabot[bot]](https://github.com/apps/dependabot)) From 307eff0f77531d4cb8569610270b762179147550 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Sep 2023 20:04:37 +0100 Subject: [PATCH 3/5] Bump net-imap from 0.3.4 to 0.3.7 (#660) Bumps [net-imap](https://github.com/ruby/net-imap) from 0.3.4 to 0.3.7. - [Release notes](https://github.com/ruby/net-imap/releases) - [Commits](https://github.com/ruby/net-imap/compare/v0.3.4...v0.3.7) --- updated-dependencies: - dependency-name: net-imap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: PaulDoyle-DEFRA <97455399+PaulDoyle-DEFRA@users.noreply.github.com> From b61952438a2925b3e9d54916d25a04fb8fa67f43 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Sep 2023 20:12:50 +0100 Subject: [PATCH 4/5] Bump nokogiri from 1.15.2 to 1.15.4 (#668) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.15.2 to 1.15.4. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.15.2...v1.15.4) --- updated-dependencies: - dependency-name: nokogiri dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: PaulDoyle-DEFRA <97455399+PaulDoyle-DEFRA@users.noreply.github.com> --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 39683949..37b4c5bd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -273,10 +273,10 @@ 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) - nokogiri (1.15.3-x86_64-linux) + nokogiri (1.15.4-x86_64-linux) racc (~> 1.4) notifications-ruby-client (5.4.0) jwt (>= 1.5, < 3) From 503050979fd320a33d1c6ed4249e2c863b7e041d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Sep 2023 20:19:44 +0100 Subject: [PATCH 5/5] Bump vcr from 6.1.0 to 6.2.0 (#649) Bumps [vcr](https://github.com/vcr/vcr) from 6.1.0 to 6.2.0. - [Release notes](https://github.com/vcr/vcr/releases) - [Changelog](https://github.com/vcr/vcr/blob/master/CHANGELOG.md) - [Commits](https://github.com/vcr/vcr/compare/v6.1.0...v6.2.0) --- updated-dependencies: - dependency-name: vcr dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: PaulDoyle-DEFRA <97455399+PaulDoyle-DEFRA@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 37b4c5bd..f5c9c624 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -447,7 +447,7 @@ GEM uniform_notifier (1.16.0) validates_email_format_of (1.7.2) i18n - vcr (6.1.0) + vcr (6.2.0) webmock (3.18.1) addressable (>= 2.8.0) crack (>= 0.3.2)