-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update lift and shift branch dependencies #104
Merged
bogdanadrianmarc
merged 50 commits into
dev-infrastructure
from
spike/dev-security-updates
Sep 26, 2023
Merged
Update lift and shift branch dependencies #104
bogdanadrianmarc
merged 50 commits into
dev-infrastructure
from
spike/dev-security-updates
Sep 26, 2023
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bundle update to pull in latest lr_common_styles
This reverts commit 7c2db6b. In particular, the tag/content tag change recommended by Rubocop caused the app not to work correctly
Revert "Fix rubocop errors". This PR reverses some changes introduced to resolve Rubocop errors, that did not have the expected effect. Fixes epimorphics/hmlr-linked-data#28
Add note re: shared issue list
…ng IE11 JS failure
#46 - more dates link
…est PR changes before release
…dard-reports-ui into 65-missing-new-counties
…dard-reports-ui into 65-missing-new-counties
…dard-reports-ui into 65-missing-new-counties
…dard-reports-ui into 65-missing-new-counties
…dard-reports-ui into 65-missing-new-counties
…dard-reports-ui into 65-missing-new-counties
…dard-reports-ui into 65-missing-new-counties
Includes the new unitary authority of 'Bournemouth, Christchurch and Poole', and three new districts: 'Somerset West and Taunton', 'West Suffolk', and 'East Suffolk'
Add missing unitary authorities (#65)
Brings dev and staging branches into alignment
Bumps [puma](https://github.com/puma/puma) from 5.3.2 to 5.6.4. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](puma/puma@v5.3.2...v5.6.4) --- updated-dependencies: - dependency-name: puma dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [yajl-ruby](https://github.com/brianmario/yajl-ruby) from 1.4.1 to 1.4.3. - [Release notes](https://github.com/brianmario/yajl-ruby/releases) - [Changelog](https://github.com/brianmario/yajl-ruby/blob/master/CHANGELOG.md) - [Commits](https://github.com/brianmario/yajl-ruby/commits) --- updated-dependencies: - dependency-name: yajl-ruby dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [tzinfo](https://github.com/tzinfo/tzinfo) from 1.2.9 to 1.2.10. - [Release notes](https://github.com/tzinfo/tzinfo/releases) - [Changelog](https://github.com/tzinfo/tzinfo/blob/master/CHANGES.md) - [Commits](tzinfo/tzinfo@v1.2.9...v1.2.10) --- updated-dependencies: - dependency-name: tzinfo dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
Also includes updated changelog and version cadence
…rict-names-data Add Folkestone and Hythe to district names
Bring staging commit history into dev
Bumps [addressable](https://github.com/sporkmonger/addressable) from 2.7.0 to 2.8.1. - [Release notes](https://github.com/sporkmonger/addressable/releases) - [Changelog](https://github.com/sporkmonger/addressable/blob/main/CHANGELOG.md) - [Commits](sporkmonger/addressable@addressable-2.7.0...addressable-2.8.1) --- updated-dependencies: - dependency-name: addressable dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.7 to 1.13.9. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/v1.13.9/CHANGELOG.md) - [Commits](sparklemotion/nokogiri@v1.11.7...v1.13.9) --- updated-dependencies: - dependency-name: nokogiri dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [loofah](https://github.com/flavorjones/loofah) from 2.10.0 to 2.19.1. - [Release notes](https://github.com/flavorjones/loofah/releases) - [Changelog](https://github.com/flavorjones/loofah/blob/main/CHANGELOG.md) - [Commits](flavorjones/loofah@v2.10.0...v2.19.1) --- updated-dependencies: - dependency-name: loofah dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [rails-html-sanitizer](https://github.com/rails/rails-html-sanitizer) from 1.3.0 to 1.4.4. - [Release notes](https://github.com/rails/rails-html-sanitizer/releases) - [Changelog](https://github.com/rails/rails-html-sanitizer/blob/master/CHANGELOG.md) - [Commits](rails/rails-html-sanitizer@v1.3.0...v1.4.4) --- updated-dependencies: - dependency-name: rails-html-sanitizer dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [globalid](https://github.com/rails/globalid) from 0.4.2 to 1.0.1. - [Release notes](https://github.com/rails/globalid/releases) - [Commits](rails/globalid@v0.4.2...v1.0.1) --- updated-dependencies: - dependency-name: globalid dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [rack](https://github.com/rack/rack) from 2.2.3 to 2.2.6.3. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](rack/rack@2.2.3...v2.2.6.3) --- updated-dependencies: - dependency-name: rack dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
…1' into spike/security-dependency-updates
…' into spike/security-dependency-updates
….9' into spike/security-dependency-updates
…nto spike/security-dependency-updates
… into spike/security-dependency-updates
…nitizer-1.4.4' into spike/security-dependency-updates
…' into spike/security-dependency-updates
….3' into spike/security-dependency-updates
…dates Spike/security dependency updates
jonrandahl
approved these changes
Sep 25, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM 👍
joescottdave
approved these changes
Sep 26, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR merges all security dependency updates made as part of epimorphics/hmlr-linked-data#127 into the lift and shift branch, along with a couple of hotfixes from the
dev
branch