From 551d8e88c81f48a97d82e530ba38f18b90d903bd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Nov 2023 10:39:31 +0000 Subject: [PATCH 1/3] Update jquery-rails requirement from ~> 4.3.5 to >= 4.3.5, < 4.7.0 Updates the requirements on [jquery-rails](https://github.com/rails/jquery-rails) to permit the latest version. - [Changelog](https://github.com/rails/jquery-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rails/jquery-rails/compare/v4.3.5...v4.6.0) --- updated-dependencies: - dependency-name: jquery-rails dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 35 ++++++++++++++++++----------------- lr_common_styles.gemspec | 2 +- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index f5f275d..400c196 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,7 +8,7 @@ PATH govuk_frontend_toolkit (~> 4.18.1) govuk_template (~> 0.18.1) haml-rails (~> 2.0.0) - jquery-rails (~> 4.3.5) + jquery-rails (>= 4.3.5, < 4.7.0) lodash-rails (~> 4.17.14) modernizr-rails (~> 2.7.1) modulejs-rails (~> 2.2.0.0) @@ -66,7 +66,7 @@ GEM autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) builder (3.2.4) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.2) crass (1.0.6) erubi (1.12.0) erubis (2.7.0) @@ -99,25 +99,25 @@ GEM haml (>= 4.0) nokogiri (>= 1.6.0) ruby_parser (~> 3.5) - i18n (1.12.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) - jquery-rails (4.3.5) + jquery-rails (4.6.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (2.6.3) lodash-rails (4.17.21) railties (>= 3.1) - loofah (2.19.1) + loofah (2.22.0) crass (~> 1.0.2) - nokogiri (>= 1.5.9) + nokogiri (>= 1.12.0) mail (2.7.1) mini_mime (>= 0.1.1) marcel (1.0.2) method_source (1.0.0) mini_mime (1.1.2) - mini_portile2 (2.8.1) - minitest (5.17.0) + mini_portile2 (2.8.5) + minitest (5.20.0) minitest-rails (5.2.0) minitest (~> 5.10) railties (~> 5.2.0) @@ -130,9 +130,9 @@ GEM nokogiri (1.13.10) mini_portile2 (~> 2.8.0) racc (~> 1.4) - racc (1.6.2) - rack (2.2.6.3) - rack-test (2.0.2) + racc (1.7.3) + rack (2.2.8) + rack-test (2.1.0) rack (>= 1.3) rails (5.2.8.1) actioncable (= 5.2.8.1) @@ -147,10 +147,11 @@ GEM bundler (>= 1.3.0) railties (= 5.2.8.1) sprockets-rails (>= 2.0.0) - 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.4.4) + rails-html-sanitizer (1.5.0) loofah (~> 2.19, >= 2.19.1) rails_real_favicon (0.1.1) json (>= 1.7, < 3) @@ -162,7 +163,7 @@ GEM method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) - rake (13.0.6) + rake (13.1.0) rb-fsevent (0.11.1) rb-inotify (0.10.1) ffi (~> 1.0) @@ -192,10 +193,10 @@ GEM activesupport (>= 5.2) sprockets (>= 3.0.0) temple (0.8.2) - thor (1.2.1) + thor (1.3.0) thread_safe (0.3.6) tilt (2.0.10) - tzinfo (1.2.10) + tzinfo (1.2.11) thread_safe (~> 0.1) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) diff --git a/lr_common_styles.gemspec b/lr_common_styles.gemspec index 2587524..ceb0626 100644 --- a/lr_common_styles.gemspec +++ b/lr_common_styles.gemspec @@ -28,7 +28,7 @@ Gem::Specification.new do |s| s.add_dependency 'govuk_frontend_toolkit', '~> 4.18.1' s.add_dependency 'govuk_template', '~> 0.18.1' s.add_dependency 'haml-rails', '~> 2.0.0' - s.add_dependency 'jquery-rails', '~> 4.3.5' + s.add_dependency 'jquery-rails', '>= 4.3.5', '< 4.7.0' s.add_dependency 'lodash-rails', '~> 4.17.14' s.add_dependency 'modernizr-rails', '~> 2.7.1' s.add_dependency 'modulejs-rails', '~> 2.2.0.0' From 7d1aedd72d06ad3d35d944b65cad7d6d08de5873 Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Thu, 5 Sep 2024 15:58:46 +0100 Subject: [PATCH 2/3] build: updated version patch cadence --- lib/lr_common_styles/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/lr_common_styles/version.rb b/lib/lr_common_styles/version.rb index a0d4b96..33ea5b9 100644 --- a/lib/lr_common_styles/version.rb +++ b/lib/lr_common_styles/version.rb @@ -3,7 +3,7 @@ module LrCommonStyles MAJOR = 1 MINOR = 9 - PATCH = 7 + PATCH = 8 SUFFIX = nil # nil or 'rc' or 'beta' or 'alpha' for pre-release versions VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}#{SUFFIX && "-#{SUFFIX}"}" end From 120be80210df1ee1f72b11aae6aa89ea72c0477f Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Thu, 5 Sep 2024 16:01:03 +0100 Subject: [PATCH 3/3] docs: updated CHANGELOG --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c6ad780..a792c31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ applications. ## Changes +## 1.9.8 - 2024-09 + +- (Jon) Implemented the dependabot PR #55 to update jquery-rails requirement + from ~> 4.3.5 to >= 4.3.5, < 4.7.0 + ## 1.9.7 - 2024-09 - (Jon) Resolves issue with the root url `/` being set to `/app/` when the