Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/bundler/rails-html-sanitizer-1.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@PaulDoyle-EA
PaulDoyle-EA authored Jan 7, 2025
2 parents 35e35b7 + e252ab1 commit a2b23b7
Show file tree
Hide file tree
Showing 4 changed files with 105 additions and 89 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ jobs:
- name: Run unit tests
run: |
bundle exec rspec
sed -i 's/\/home\/runner\/work\/waste-carriers-front-office\/waste-carriers-front-office\//\/github\/workspace\//g' coverage/coverage.json
sed -i "s@/home/runner/work/DEFRA/waste-carriers-front-office@/github/workspace@g" coverage/coverage.json
- name: Analyze with SonarCloud
uses: sonarsource/sonarcloud-github-action@master
uses: sonarsource/sonarqube-scan-action@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This is provided automatically by GitHub
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} # This needs to be set in your repo; settings -> secrets
180 changes: 94 additions & 86 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,18 @@ GIT

GIT
remote: https://github.com/DEFRA/waste-carriers-engine
revision: 916aca32ca7ccb144694cd0760b3fc4c72a6e6ab
revision: 0323a914809d4c4c55b0fb6a2a446fcf2b950997
branch: main
specs:
waste_carriers_engine (0.0.1)
aasm (~> 5.5.0)
countries (~> 5.5.0)
defra_ruby_address (~> 0.1.0)
defra_ruby_alert (~> 2.2.1)
defra_ruby_companies_house
defra_ruby_email (~> 1.3.0)
defra_ruby_govpay
defra_ruby_validators (~> 2.6)
defra_ruby_validators (~> 3.0)
high_voltage (~> 3.1.2)
jbuilder (~> 2.11.5)
mongo_session_store (~> 3.2.1)
Expand All @@ -39,74 +40,74 @@ GEM
specs:
aasm (5.5.0)
concurrent-ruby (~> 1.0)
actioncable (7.0.8.6)
actionpack (= 7.0.8.6)
activesupport (= 7.0.8.6)
actioncable (7.0.8.7)
actionpack (= 7.0.8.7)
activesupport (= 7.0.8.7)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (7.0.8.6)
actionpack (= 7.0.8.6)
activejob (= 7.0.8.6)
activerecord (= 7.0.8.6)
activestorage (= 7.0.8.6)
activesupport (= 7.0.8.6)
actionmailbox (7.0.8.7)
actionpack (= 7.0.8.7)
activejob (= 7.0.8.7)
activerecord (= 7.0.8.7)
activestorage (= 7.0.8.7)
activesupport (= 7.0.8.7)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.0.8.6)
actionpack (= 7.0.8.6)
actionview (= 7.0.8.6)
activejob (= 7.0.8.6)
activesupport (= 7.0.8.6)
actionmailer (7.0.8.7)
actionpack (= 7.0.8.7)
actionview (= 7.0.8.7)
activejob (= 7.0.8.7)
activesupport (= 7.0.8.7)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
actionpack (7.0.8.6)
actionview (= 7.0.8.6)
activesupport (= 7.0.8.6)
actionpack (7.0.8.7)
actionview (= 7.0.8.7)
activesupport (= 7.0.8.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.8.6)
actionpack (= 7.0.8.6)
activerecord (= 7.0.8.6)
activestorage (= 7.0.8.6)
activesupport (= 7.0.8.6)
actiontext (7.0.8.7)
actionpack (= 7.0.8.7)
activerecord (= 7.0.8.7)
activestorage (= 7.0.8.7)
activesupport (= 7.0.8.7)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.0.8.6)
activesupport (= 7.0.8.6)
actionview (7.0.8.7)
activesupport (= 7.0.8.7)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (7.0.8.6)
activesupport (= 7.0.8.6)
activejob (7.0.8.7)
activesupport (= 7.0.8.7)
globalid (>= 0.3.6)
activemodel (7.0.8.6)
activesupport (= 7.0.8.6)
activerecord (7.0.8.6)
activemodel (= 7.0.8.6)
activesupport (= 7.0.8.6)
activestorage (7.0.8.6)
actionpack (= 7.0.8.6)
activejob (= 7.0.8.6)
activerecord (= 7.0.8.6)
activesupport (= 7.0.8.6)
activemodel (7.0.8.7)
activesupport (= 7.0.8.7)
activerecord (7.0.8.7)
activemodel (= 7.0.8.7)
activesupport (= 7.0.8.7)
activestorage (7.0.8.7)
actionpack (= 7.0.8.7)
activejob (= 7.0.8.7)
activerecord (= 7.0.8.7)
activesupport (= 7.0.8.7)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (7.0.8.6)
activesupport (7.0.8.7)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
airbrake (13.0.4)
airbrake (13.0.5)
airbrake-ruby (~> 6.0)
airbrake-ruby (6.2.2)
rbtree3 (~> 0.6)
Expand Down Expand Up @@ -175,13 +176,16 @@ GEM
database_cleaner-mongoid (2.0.1)
database_cleaner-core (~> 2.0.0)
mongoid
date (3.4.0)
date (3.4.1)
defra_ruby_address (0.1.0)
rest-client (~> 2.0)
defra_ruby_alert (2.2.1)
airbrake
defra_ruby_aws (0.5.0)
aws-sdk-s3
defra_ruby_companies_house (1.0.3)
i18n
rest-client (~> 2.0)
defra_ruby_email (1.3.0)
notifications-ruby-client
rails
Expand All @@ -194,8 +198,9 @@ GEM
rubocop-rake
rubocop-rspec
defra_ruby_template (5.4.1)
defra_ruby_validators (2.7.2)
defra_ruby_validators (3.0.0)
activemodel
defra_ruby_companies_house
i18n
matrix
os_map_ref
Expand All @@ -215,11 +220,11 @@ GEM
diff-lcs (1.5.1)
docile (1.4.0)
domain_name (0.6.20240107)
dotenv (3.1.4)
dotenv-rails (3.1.4)
dotenv (= 3.1.4)
dotenv (3.1.7)
dotenv-rails (3.1.7)
dotenv (= 3.1.7)
railties (>= 6.1)
erubi (1.13.0)
erubi (1.13.1)
execjs (2.9.1)
factory_bot (6.5.0)
activesupport (>= 5.0.0)
Expand Down Expand Up @@ -257,7 +262,7 @@ GEM
html-attributes-utils (1.0.2)
activesupport (>= 6.1.4.4)
http-accept (1.7.0)
http-cookie (1.0.7)
http-cookie (1.0.8)
domain_name (~> 0.5)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
Expand All @@ -270,8 +275,8 @@ GEM
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (2.8.2)
jwt (2.9.3)
json (2.9.1)
jwt (2.10.1)
base64
kaminari (1.2.2)
activesupport (>= 4.1.0)
Expand All @@ -289,8 +294,8 @@ GEM
kaminari-core (~> 1.0)
mongoid
language_server-protocol (3.17.0.3)
logger (1.6.1)
loofah (2.23.1)
logger (1.6.4)
loofah (2.24.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
mail (2.8.1)
Expand All @@ -304,10 +309,10 @@ GEM
mime-types (3.6.0)
logger
mime-types-data (~> 3.2015)
mime-types-data (3.2024.1105)
mime-types-data (3.2024.1203)
mini_mime (1.1.5)
mini_portile2 (2.8.8)
minitest (5.25.1)
minitest (5.25.4)
mongo (2.21.0)
bson (>= 4.14.1, < 6.0.0)
mongo_session_store (3.2.1)
Expand All @@ -320,7 +325,7 @@ GEM
mongoid-locker (2.0.2)
mongoid (>= 5.0, < 9)
multi_json (1.15.0)
net-imap (0.5.1)
net-imap (0.5.5)
date
net-protocol
net-pop (0.1.2)
Expand Down Expand Up @@ -348,7 +353,7 @@ GEM
passenger (5.3.7)
rack
rake (>= 0.8.1)
phonelib (0.9.3)
phonelib (0.10.3)
protocol-hpack (1.4.2)
protocol-http (0.24.7)
protocol-http1 (0.15.1)
Expand All @@ -361,22 +366,22 @@ GEM
nio4r (~> 2.0)
racc (1.8.1)
rack (2.2.10)
rack-test (2.1.0)
rack-test (2.2.0)
rack (>= 1.3)
rails (7.0.8.6)
actioncable (= 7.0.8.6)
actionmailbox (= 7.0.8.6)
actionmailer (= 7.0.8.6)
actionpack (= 7.0.8.6)
actiontext (= 7.0.8.6)
actionview (= 7.0.8.6)
activejob (= 7.0.8.6)
activemodel (= 7.0.8.6)
activerecord (= 7.0.8.6)
activestorage (= 7.0.8.6)
activesupport (= 7.0.8.6)
rails (7.0.8.7)
actioncable (= 7.0.8.7)
actionmailbox (= 7.0.8.7)
actionmailer (= 7.0.8.7)
actionpack (= 7.0.8.7)
actiontext (= 7.0.8.7)
actionview (= 7.0.8.7)
activejob (= 7.0.8.7)
activemodel (= 7.0.8.7)
activerecord (= 7.0.8.7)
activestorage (= 7.0.8.7)
activesupport (= 7.0.8.7)
bundler (>= 1.15.0)
railties (= 7.0.8.6)
railties (= 7.0.8.7)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
Expand All @@ -385,20 +390,20 @@ GEM
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.6.1)
rails-html-sanitizer (1.6.2)
loofah (~> 2.21)
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
railties (7.0.8.6)
actionpack (= 7.0.8.6)
activesupport (= 7.0.8.6)
railties (7.0.8.7)
actionpack (= 7.0.8.7)
activesupport (= 7.0.8.7)
method_source
rake (>= 12.2)
thor (~> 1.0)
zeitwerk (~> 2.5)
rainbow (3.1.1)
rake (13.2.1)
rbtree3 (0.7.1)
regexp_parser (2.9.2)
regexp_parser (2.10.0)
responders (3.1.1)
actionpack (>= 5.2)
railties (>= 5.2)
Expand All @@ -424,30 +429,30 @@ GEM
rspec-mocks (~> 3.13)
rspec-support (~> 3.13)
rspec-support (3.13.1)
rubocop (1.68.0)
rubocop (1.69.2)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 2.4, < 3.0)
rubocop-ast (>= 1.32.2, < 2.0)
regexp_parser (>= 2.9.3, < 3.0)
rubocop-ast (>= 1.36.2, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.36.1)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.37.0)
parser (>= 3.3.1.0)
rubocop-capybara (2.21.0)
rubocop (~> 1.41)
rubocop-factory_bot (2.26.1)
rubocop (~> 1.61)
rubocop-rails (2.27.0)
rubocop-rails (2.28.0)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.52.0, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rake (0.6.0)
rubocop (~> 1.0)
rubocop-rspec (3.2.0)
rubocop-rspec (3.3.0)
rubocop (~> 1.61)
rubocop-rspec_rails (2.30.0)
rubocop (~> 1.61)
Expand All @@ -465,7 +470,7 @@ GEM
sawyer (0.9.2)
addressable (>= 2.3.5)
faraday (>= 0.17.3, < 3)
secure_headers (7.0.0)
secure_headers (7.1.0)
show_me_the_cookies (6.0.0)
capybara (>= 2, < 4)
simplecov (0.22.0)
Expand All @@ -486,7 +491,7 @@ GEM
thor (1.3.2)
tilt (2.2.0)
timecop (0.9.10)
timeout (0.4.2)
timeout (0.4.3)
timers (4.3.5)
traces (0.11.1)
turbolinks (5.2.1)
Expand All @@ -498,7 +503,9 @@ GEM
execjs (>= 0.3.0, < 3)
uk_postcode (2.1.8)
unaccent (0.4.0)
unicode-display_width (2.6.0)
unicode-display_width (3.1.3)
unicode-emoji (~> 4.0, >= 4.0.4)
unicode-emoji (4.0.4)
validates_email_format_of (1.8.2)
i18n (>= 0.8.0)
simpleidn
Expand All @@ -509,8 +516,9 @@ GEM
activemodel (>= 6.0.0)
bindex (>= 0.4.0)
railties (>= 6.0.0)
webrick (1.9.0)
websocket-driver (0.7.6)
webrick (1.9.1)
websocket-driver (0.7.7)
base64
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
wicked_pdf (2.6.3)
Expand Down
Loading

0 comments on commit a2b23b7

Please sign in to comment.