baarkerlounger
/
submit-social-housing-lettings-and-sales-data
mirror of https://github.com/communitiesuk/submit-social-housing-lettings-and-sales-data.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'main' into CLDC-4273-update-rails-version

pull/3364/head
Nat Dean-Lewis 4 days ago
parent
240dfbc132 8db6f8d761
commit
33503de2ce
2 changed files with 94 additions and 95 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 161
      Gemfile.lock
  2. 28
      yarn.lock

161
Gemfile.lock
Unescape View File

@ -1,84 +1,83 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
action_text-trix (2.1.19) actioncable (7.2.3.2)
railties actionpack (= 7.2.3.2)
actioncable (8.1.3) activesupport (= 7.2.3.2)
actionpack (= 8.1.3)
activesupport (= 8.1.3)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (>= 0.6.1) websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6) zeitwerk (~> 2.6)
actionmailbox (8.1.3) actionmailbox (7.2.3.2)
actionpack (= 8.1.3) actionpack (= 7.2.3.2)
activejob (= 8.1.3) activejob (= 7.2.3.2)
activerecord (= 8.1.3) activerecord (= 7.2.3.2)
activestorage (= 8.1.3) activestorage (= 7.2.3.2)
activesupport (= 8.1.3) activesupport (= 7.2.3.2)
mail (>= 2.8.0) mail (>= 2.8.0)
actionmailer (8.1.3) actionmailer (7.2.3.2)
actionpack (= 8.1.3) actionpack (= 7.2.3.2)
actionview (= 8.1.3) actionview (= 7.2.3.2)
activejob (= 8.1.3) activejob (= 7.2.3.2)
activesupport (= 8.1.3) activesupport (= 7.2.3.2)
mail (>= 2.8.0) mail (>= 2.8.0)
rails-dom-testing (~> 2.2) rails-dom-testing (~> 2.2)
actionpack (8.1.3) actionpack (7.2.3.2)
actionview (= 8.1.3) actionview (= 7.2.3.2)
activesupport (= 8.1.3) activesupport (= 7.2.3.2)
cgi
nokogiri (>= 1.8.5) nokogiri (>= 1.8.5)
rack (>= 2.2.4) racc
rack (>= 2.2.4, < 3.3)
rack-session (>= 1.0.1) rack-session (>= 1.0.1)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2) rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6) rails-html-sanitizer (~> 1.6)
useragent (~> 0.16) useragent (~> 0.16)
actiontext (8.1.3) actiontext (7.2.3.2)
action_text-trix (~> 2.1.15) actionpack (= 7.2.3.2)
actionpack (= 8.1.3) activerecord (= 7.2.3.2)
activerecord (= 8.1.3) activestorage (= 7.2.3.2)
activestorage (= 8.1.3) activesupport (= 7.2.3.2)
activesupport (= 8.1.3)
globalid (>= 0.6.0) globalid (>= 0.6.0)
nokogiri (>= 1.8.5) nokogiri (>= 1.8.5)
actionview (8.1.3) actionview (7.2.3.2)
activesupport (= 8.1.3) activesupport (= 7.2.3.2)
builder (~> 3.1) builder (~> 3.1)
cgi
erubi (~> 1.11) erubi (~> 1.11)
rails-dom-testing (~> 2.2) rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6) rails-html-sanitizer (~> 1.6)
activejob (8.1.3) activejob (7.2.3.2)
activesupport (= 8.1.3) activesupport (= 7.2.3.2)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (8.1.3) activemodel (7.2.3.2)
activesupport (= 8.1.3) activesupport (= 7.2.3.2)
activemodel-serializers-xml (1.0.3) activemodel-serializers-xml (1.0.3)
activemodel (>= 5.0.0.a) activemodel (>= 5.0.0.a)
activesupport (>= 5.0.0.a) activesupport (>= 5.0.0.a)
builder (~> 3.1) builder (~> 3.1)
activerecord (8.1.3) activerecord (7.2.3.2)
activemodel (= 8.1.3) activemodel (= 7.2.3.2)
activesupport (= 8.1.3) activesupport (= 7.2.3.2)
timeout (>= 0.4.0) timeout (>= 0.4.0)
activestorage (8.1.3) activestorage (7.2.3.2)
actionpack (= 8.1.3) actionpack (= 7.2.3.2)
activejob (= 8.1.3) activejob (= 7.2.3.2)
activerecord (= 8.1.3) activerecord (= 7.2.3.2)
activesupport (= 8.1.3) activesupport (= 7.2.3.2)
marcel (~> 1.0) marcel (~> 1.0)
activesupport (8.1.3) activesupport (7.2.3.2)
base64 base64
benchmark (>= 0.3)
bigdecimal bigdecimal
concurrent-ruby (~> 1.0, >= 1.3.1) concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5) connection_pool (>= 2.2.5)
drb drb
i18n (>= 1.6, < 2) i18n (>= 1.6, < 2)
json
logger (>= 1.4.2) logger (>= 1.4.2)
minitest (>= 5.1) minitest (>= 5.1, < 6)
securerandom (>= 0.3) securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5) tzinfo (~> 2.0, >= 2.0.5)
uri (>= 0.13.1)
addressable (2.9.0) addressable (2.9.0)
public_suffix (>= 2.0.2, < 8.0) public_suffix (>= 2.0.2, < 8.0)
ast (2.4.3) ast (2.4.3)
@ -116,6 +115,7 @@ GEM
thread_safe (~> 0.3, >= 0.3.1) thread_safe (~> 0.3, >= 0.3.1)
base64 (0.3.0) base64 (0.3.0)
bcrypt (3.1.22) bcrypt (3.1.22)
benchmark (0.5.0)
better_html (2.2.0) better_html (2.2.0)
actionview (>= 7.0) actionview (>= 7.0)
activesupport (>= 7.0) activesupport (>= 7.0)
@ -149,12 +149,13 @@ GEM
capybara-screenshot (1.0.26) capybara-screenshot (1.0.26)
capybara (>= 1.0, < 4) capybara (>= 1.0, < 4)
launchy launchy
cgi (0.5.2)
childprocess (5.0.0) childprocess (5.0.0)
coderay (1.1.3) coderay (1.1.3)
coercible (1.0.0) coercible (1.0.0)
descendants_tracker (~> 0.0.1) descendants_tracker (~> 0.0.1)
concurrent-ruby (1.3.8) concurrent-ruby (1.3.8)
connection_pool (3.0.2) connection_pool (2.5.5)
crack (1.0.0) crack (1.0.0)
bigdecimal bigdecimal
rexml rexml
@ -189,7 +190,7 @@ GEM
drb (2.2.3) drb (2.2.3)
dumb_delegator (1.0.0) dumb_delegator (1.0.0)
encryptor (3.0.0) encryptor (3.0.0)
erb (6.0.6) erb (6.0.4)
erb_lint (0.9.0) erb_lint (0.9.0)
activesupport activesupport
better_html (>= 2.0.1) better_html (>= 2.0.1)
@ -252,7 +253,7 @@ GEM
jmespath (1.6.2) jmespath (1.6.2)
jsbundling-rails (1.3.0) jsbundling-rails (1.3.0)
railties (>= 6.0.0) railties (>= 6.0.0)
json (2.21.1) json (2.20.0)
json-schema (4.1.1) json-schema (4.1.1)
addressable (>= 2.8) addressable (>= 2.8)
jwt (3.2.0) jwt (3.2.0)
@ -280,8 +281,7 @@ GEM
loofah (2.25.2) loofah (2.25.2)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.12.0) nokogiri (>= 1.12.0)
mail (2.9.1) mail (2.8.1)
logger
mini_mime (>= 0.1.1) mini_mime (>= 0.1.1)
net-imap net-imap
net-pop net-pop
@ -290,15 +290,13 @@ GEM
matrix (0.4.2) matrix (0.4.2)
method_source (1.1.0) method_source (1.1.0)
mini_mime (1.1.5) mini_mime (1.1.5)
minitest (6.0.6) minitest (5.27.0)
drb (~> 2.0)
prism (~> 1.5)
msgpack (1.8.3) msgpack (1.8.3)
multipart-post (2.4.1) multipart-post (2.4.1)
nested_form (0.3.2) nested_form (0.3.2)
net-http (0.9.1) net-http (0.9.1)
uri (>= 0.11.1) uri (>= 0.11.1)
net-imap (0.6.6) net-imap (0.6.4.1)
date date
net-protocol net-protocol
net-pop (0.1.2) net-pop (0.1.2)
@ -324,8 +322,8 @@ GEM
iniparse (~> 1.4) iniparse (~> 1.4)
rexml (~> 3.2) rexml (~> 3.2)
pagy (9.4.0) pagy (9.4.0)
paper_trail (17.0.0) paper_trail (15.2.0)
activerecord (>= 7.1) activerecord (>= 6.1)
request_store (~> 1.4) request_store (~> 1.4)
paper_trail-globalid (0.2.0) paper_trail-globalid (0.2.0)
globalid globalid
@ -338,7 +336,7 @@ GEM
racc racc
pg (1.5.5) pg (1.5.5)
possessive (1.0.1) possessive (1.0.1)
pp (0.6.4) pp (0.6.3)
prettyprint prettyprint
prettyprint (0.2.0) prettyprint (0.2.0)
prism (1.9.0) prism (1.9.0)
@ -353,6 +351,9 @@ GEM
pry-byebug (3.10.1) pry-byebug (3.10.1)
byebug (~> 11.0) byebug (~> 11.0)
pry (>= 0.13, < 0.15) pry (>= 0.13, < 0.15)
psych (5.3.1)
date
stringio
public_suffix (7.0.5) public_suffix (7.0.5)
puma (7.2.1) puma (7.2.1)
nio4r (~> 2.0) nio4r (~> 2.0)
@ -372,20 +373,20 @@ GEM
rack (>= 1.3) rack (>= 1.3)
rackup (2.3.1) rackup (2.3.1)
rack (>= 3) rack (>= 3)
rails (8.1.3) rails (7.2.3.2)
actioncable (= 8.1.3) actioncable (= 7.2.3.2)
actionmailbox (= 8.1.3) actionmailbox (= 7.2.3.2)
actionmailer (= 8.1.3) actionmailer (= 7.2.3.2)
actionpack (= 8.1.3) actionpack (= 7.2.3.2)
actiontext (= 8.1.3) actiontext (= 7.2.3.2)
actionview (= 8.1.3) actionview (= 7.2.3.2)
activejob (= 8.1.3) activejob (= 7.2.3.2)
activemodel (= 8.1.3) activemodel (= 7.2.3.2)
activerecord (= 8.1.3) activerecord (= 7.2.3.2)
activestorage (= 8.1.3) activestorage (= 7.2.3.2)
activesupport (= 8.1.3) activesupport (= 7.2.3.2)
bundler (>= 1.15.0) bundler (>= 1.15.0)
railties (= 8.1.3) railties (= 7.2.3.2)
rails-dom-testing (2.3.0) rails-dom-testing (2.3.0)
activesupport (>= 5.0.0) activesupport (>= 5.0.0)
minitest minitest
@ -400,9 +401,10 @@ GEM
nested_form (~> 0.3) nested_form (~> 0.3)
rails (>= 6.0, < 9) rails (>= 6.0, < 9)
turbo-rails (>= 1.0, < 3) turbo-rails (>= 1.0, < 3)
railties (8.1.3) railties (7.2.3.2)
actionpack (= 8.1.3) actionpack (= 7.2.3.2)
activesupport (= 8.1.3) activesupport (= 7.2.3.2)
cgi
irb (~> 1.13) irb (~> 1.13)
rackup (>= 1.0.0) rackup (>= 1.0.0)
rake (>= 12.2) rake (>= 12.2)
@ -415,14 +417,9 @@ GEM
rb-fsevent (0.11.2) rb-fsevent (0.11.2)
rb-inotify (0.10.1) rb-inotify (0.10.1)
ffi (~> 1.0) ffi (~> 1.0)
rbs (4.1.0) rdoc (7.2.0)
logger
prism (>= 1.6.0)
tsort
rdoc (8.0.0)
erb erb
prism (>= 1.6.0) psych (>= 4.0.0)
rbs (>= 4.0.0)
tsort tsort
redcarpet (3.6.0) redcarpet (3.6.0)
redis (4.8.1) redis (4.8.1)
@ -534,6 +531,7 @@ GEM
smart_properties (1.17.0) smart_properties (1.17.0)
stimulus-rails (1.3.3) stimulus-rails (1.3.3)
railties (>= 6.0.0) railties (>= 6.0.0)
stringio (3.2.0)
thor (1.4.0) thor (1.4.0)
thread_safe (0.3.6) thread_safe (0.3.6)
timecop (0.9.8) timecop (0.9.8)
@ -597,6 +595,7 @@ DEPENDENCIES
capybara capybara
capybara-lockstep capybara-lockstep
capybara-screenshot capybara-screenshot
connection_pool (~> 2.5)
cssbundling-rails cssbundling-rails
devise devise
devise_two_factor_authentication devise_two_factor_authentication
@ -616,7 +615,7 @@ DEPENDENCIES
nokogiri (~> 1.19.1) nokogiri (~> 1.19.1)
notifications-ruby-client notifications-ruby-client
overcommit (>= 0.37.0) overcommit (>= 0.37.0)
paper_trail (~> 17.0) paper_trail (~> 15.2)
paper_trail-globalid paper_trail-globalid
parallel_tests parallel_tests
pg (~> 1.1) pg (~> 1.1)
@ -628,7 +627,7 @@ DEPENDENCIES
rack (~> 3.1.20) rack (~> 3.1.20)
rack-attack rack-attack
rack-mini-profiler (~> 3.3.0) rack-mini-profiler (~> 3.3.0)
rails (~> 8.1.3) rails (~> 7.2.2)
rails_admin (~> 3.1) rails_admin (~> 3.1)
redcarpet (~> 3.6) redcarpet (~> 3.6)
redis (~> 4.8) redis (~> 4.8)

28
yarn.lock
Unescape View File

@ -2544,9 +2544,9 @@ fast-levenshtein@^2.0.6:
integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
fast-uri@^3.0.1: fast-uri@^3.0.1:
version "3.1.2" version "3.1.4"
resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.1.2.tgz#8af3d4fc9d3e71b11572cc2673b514a7d1a8c8ec" resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.1.4.tgz#3b3daf9ce68f41f956df0b505132c0cfce9ec7af"
integrity sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ== integrity sha512-8JnbkQ4juDyvYs4mgFGQqg4yCYtFDtUtmp2QIQq11ZZe5CFQ5wcqm1rqDgAh/QdMySuBnPzMUiJUNZG5N/AiQw==
fastest-levenshtein@^1.0.12, fastest-levenshtein@^1.0.16: fastest-levenshtein@^1.0.12, fastest-levenshtein@^1.0.16:
version "1.0.16" version "1.0.16"
@ -2915,9 +2915,9 @@ ignore@^5.1.9:
integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
immutable@^4.0.0: immutable@^4.0.0:
version "4.3.8" version "4.3.9"
resolved "https://registry.npmjs.org/immutable/-/immutable-4.3.8.tgz" resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.9.tgz#c98349e05e9c6e2a4d8fe88ac0b363e0d536b544"
integrity sha512-d/Ld9aLbKpNwyl0KiM2CT1WYvkitQ1TSvmRtkcV8FKStiDoA7Slzgjmb/1G2yhKM1p0XeNOieaTbFZmU1d3Xuw== integrity sha512-ObHy4YN7ycwZOUCLI1/6svfyAFu7vL8RhAvVu/bh/RZW9EPlOyDaQ9jDQWCtdqzaXUjgXZCW1migtHE7YI7UGQ==
import-fresh@^3.2.1, import-fresh@^3.3.0: import-fresh@^3.2.1, import-fresh@^3.3.0:
version "3.3.0" version "3.3.0"
@ -3513,10 +3513,10 @@ mutation-observer-inner-html-shim@^1.0.0:
resolved "https://registry.npmjs.org/mutation-observer-inner-html-shim/-/mutation-observer-inner-html-shim-1.0.1.tgz" resolved "https://registry.npmjs.org/mutation-observer-inner-html-shim/-/mutation-observer-inner-html-shim-1.0.1.tgz"
integrity sha512-YmJPDSUWJgBhwqRJP6AMvjdfDHU1gsrT5YdgpxMit2+x1khLYhdYq9fvp4clPsYecVT3JOprBf/KjEX7IqlU+g== integrity sha512-YmJPDSUWJgBhwqRJP6AMvjdfDHU1gsrT5YdgpxMit2+x1khLYhdYq9fvp4clPsYecVT3JOprBf/KjEX7IqlU+g==
nanoid@^3.3.12: nanoid@^3.3.16:
version "3.3.12" version "3.3.16"
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.12.tgz#ab3d912e217a6d0a514f00a72a16543a28982c05" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.16.tgz#a04d8ec4b1f10009d2d533947aefe4293737816c"
integrity sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ== integrity sha512-bzlKTyNJ7+LdGIIwy8ijFpIqEQIvafahV7eYykJ8Cvh42EdJeODoJ6gUJXpQJvej1BddH8OqTXZNE/KfbWAu8Q==
natural-compare@^1.4.0: natural-compare@^1.4.0:
version "1.4.0" version "1.4.0"
@ -3830,11 +3830,11 @@ postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0:
integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
postcss@^8.4.33, postcss@^8.4.41: postcss@^8.4.33, postcss@^8.4.41:
version "8.5.15" version "8.5.24"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.15.tgz#d1eaf677a324e9ec02196da2d3fecf4a0b9a735c" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.24.tgz#01d8b032451e1b9ec41ae66eaf02843f42a720d2"
integrity sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A== integrity sha512-8RyVklq0owXUTa4xlpzu4l9AaVKIdQvAcOHZWaMh98HgySsUtxRVf/chRe3dsSLqb6i40BzGRzEUddRaI+9TSw==
dependencies: dependencies:
nanoid "^3.3.12" nanoid "^3.3.16"
picocolors "^1.1.1" picocolors "^1.1.1"
source-map-js "^1.2.1" source-map-js "^1.2.1"

Write Preview
Loading…
Cancel
Save