Skip to content

Commit

Permalink
Merge pull request #66 from epimorphics/spike/local-dependabot-checks
Browse files Browse the repository at this point in the history
Dependabot Update Implementation
  • Loading branch information
jonrandahl authored Sep 5, 2024
2 parents 637056c + 120be80 commit 7888e3a
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 19 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
35 changes: 18 additions & 17 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion lib/lr_common_styles/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion lr_common_styles.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down

0 comments on commit 7888e3a

Please sign in to comment.