diff --git a/.ruby-version b/.ruby-version index a603bb50..49cdd668 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.5 +2.7.6 diff --git a/Dockerfile b/Dockerfile index 5726c0b0..76f02820 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.7.5-slim +FROM ruby:2.7.6-slim # Add basic binaries RUN apt-get update \ diff --git a/Gemfile b/Gemfile index 5bad1f72..1bd81fa5 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' -ruby '2.7.5' +ruby '2.7.6' -gem 'rails', '5.2.6.3' +gem 'rails', '5.2.8' gem 'activeadmin', '~> 2.1' gem 'bootsnap', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 43a6b836..7f9758cb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,25 +1,25 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.2.6.3) - actionpack (= 5.2.6.3) + actioncable (5.2.8) + actionpack (= 5.2.8) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.6.3) - actionpack (= 5.2.6.3) - actionview (= 5.2.6.3) - activejob (= 5.2.6.3) + actionmailer (5.2.8) + actionpack (= 5.2.8) + actionview (= 5.2.8) + activejob (= 5.2.8) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.6.3) - actionview (= 5.2.6.3) - activesupport (= 5.2.6.3) + actionpack (5.2.8) + actionview (= 5.2.8) + activesupport (= 5.2.8) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.6.3) - activesupport (= 5.2.6.3) + actionview (5.2.8) + activesupport (= 5.2.8) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -35,20 +35,20 @@ GEM ransack (~> 2.1, >= 2.1.1) sassc-rails (~> 2.1) sprockets (>= 3.0, < 4.1) - activejob (5.2.6.3) - activesupport (= 5.2.6.3) + activejob (5.2.8) + activesupport (= 5.2.8) globalid (>= 0.3.6) - activemodel (5.2.6.3) - activesupport (= 5.2.6.3) - activerecord (5.2.6.3) - activemodel (= 5.2.6.3) - activesupport (= 5.2.6.3) + activemodel (5.2.8) + activesupport (= 5.2.8) + activerecord (5.2.8) + activemodel (= 5.2.8) + activesupport (= 5.2.8) arel (>= 9.0) - activestorage (5.2.6.3) - actionpack (= 5.2.6.3) - activerecord (= 5.2.6.3) + activestorage (5.2.8) + actionpack (= 5.2.8) + activerecord (= 5.2.8) marcel (~> 1.0.0) - activesupport (5.2.6.3) + activesupport (5.2.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -93,7 +93,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.9) + concurrent-ruby (1.1.10) countries (3.0.1) i18n_data (~> 0.10.0) sixarm_ruby_unaccent (~> 1.1) @@ -175,7 +175,7 @@ GEM hashdiff (1.0.1) high_voltage (3.0.0) http_accept_language (2.1.1) - i18n (1.8.10) + i18n (1.10.0) concurrent-ruby (~> 1.0) i18n-debug (1.2.0) i18n (< 2) @@ -211,7 +211,7 @@ GEM rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - loofah (2.14.0) + loofah (2.18.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -221,7 +221,7 @@ GEM activemodel (>= 5.0) marcel (1.0.2) method_source (1.0.0) - mini_mime (1.1.0) + mini_mime (1.1.2) mini_portile2 (2.8.0) minitest (5.15.0) msgpack (1.3.3) @@ -230,7 +230,7 @@ GEM mustermann-grape (1.0.1) mustermann (>= 1.0.0) nio4r (2.5.8) - nokogiri (1.13.3) + nokogiri (1.13.6) mini_portile2 (~> 2.8.0) racc (~> 1.4) orm_adapter (0.5.0) @@ -251,10 +251,10 @@ GEM coderay (~> 1.1) method_source (~> 1.0) public_suffix (4.0.6) - puma (5.6.2) + puma (5.6.4) nio4r (~> 2.0) racc (1.6.0) - rack (2.2.3) + rack (2.2.3.1) rack-accept (0.4.5) rack (>= 0.4) rack-cors (1.1.1) @@ -265,27 +265,27 @@ GEM rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.6.3) - actioncable (= 5.2.6.3) - actionmailer (= 5.2.6.3) - actionpack (= 5.2.6.3) - actionview (= 5.2.6.3) - activejob (= 5.2.6.3) - activemodel (= 5.2.6.3) - activerecord (= 5.2.6.3) - activestorage (= 5.2.6.3) - activesupport (= 5.2.6.3) + rails (5.2.8) + actioncable (= 5.2.8) + actionmailer (= 5.2.8) + actionpack (= 5.2.8) + actionview (= 5.2.8) + activejob (= 5.2.8) + activemodel (= 5.2.8) + activerecord (= 5.2.8) + activestorage (= 5.2.8) + activesupport (= 5.2.8) bundler (>= 1.3.0) - railties (= 5.2.6.3) + railties (= 5.2.8) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.4.2) loofah (~> 2.3) - railties (5.2.6.3) - actionpack (= 5.2.6.3) - activesupport (= 5.2.6.3) + railties (5.2.8) + actionpack (= 5.2.8) + activesupport (= 5.2.8) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) @@ -368,12 +368,12 @@ GEM sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.2) - actionpack (>= 4.0) - activesupport (>= 4.0) + sprockets-rails (3.4.2) + actionpack (>= 5.2) + activesupport (>= 5.2) sprockets (>= 3.0.0) temple (0.8.2) - thor (1.1.0) + thor (1.2.1) thread_safe (0.3.6) tilt (2.0.10) turbolinks (5.2.1) @@ -439,7 +439,7 @@ DEPENDENCIES puma rack-cors rack-jsonp - rails (= 5.2.6.3) + rails (= 5.2.8) rakismet rspec-rails rubocop @@ -457,7 +457,7 @@ DEPENDENCIES webpacker (~> 5) RUBY VERSION - ruby 2.7.5p203 + ruby 2.7.6p219 BUNDLED WITH 2.1.4 diff --git a/README.md b/README.md index ce4475c8..c6a1647f 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ Please also read our [Code of Conduct](https://github.com/RefugeRestrooms/refuge ## Tech -* Ruby Version - ruby-2.7.5 +* Ruby Version - ruby-2.7.6 * Ruby on Rails * RSpec * Javascript diff --git a/package.json b/package.json index fcc84dfc..9331c0e6 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,8 @@ "webpack-dev-server/**/ansi-html": "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41", "webpack-dev-server/**/ansi-regex": "^5.0.1", "@rails/webpacker/**/ansi-regex": "^5.0.1", - "@rails/webpacker/**/nth-check": "^2.0.1" + "@rails/webpacker/**/nth-check": "^2.0.1", + "swagger-ui/**/@braintree/sanitize-url": "^6.0.0" }, "engines": { "yarn": ">=1.0.2" diff --git a/yarn.lock b/yarn.lock index ee016d8d..055b3281 100644 --- a/yarn.lock +++ b/yarn.lock @@ -965,10 +965,10 @@ "@babel/helper-validator-identifier" "^7.14.5" to-fast-properties "^2.0.0" -"@braintree/sanitize-url@^5.0.2": - version "5.0.2" - resolved "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-5.0.2.tgz#b23080fa35520e993a8a37a0f5bca26aa4650a48" - integrity sha512-NBEJlHWrhQucLhZGHtSxM2loSaNUMajC7KOYJLyfcdW/6goVoff2HoYI3bz8YCDN0wKGbxtUL0gx2dvHpvnWlw== +"@braintree/sanitize-url@^5.0.2", "@braintree/sanitize-url@^6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-6.0.0.tgz#fe364f025ba74f6de6c837a84ef44bdb1d61e68f" + integrity sha512-mgmE7XBYY/21erpzhexk4Cj1cyTQ9LzvnTxtzM17BJ7ERMNE6W72mQRo0I1Ud8eFJ+RVVIcBNhLFZ3GX4XFz5w== "@csstools/convert-colors@^1.4.0": version "1.4.0" @@ -1460,9 +1460,9 @@ async-limiter@~1.0.0: integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== async@^2.6.2: - version "2.6.3" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" - integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg== + version "2.6.4" + resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" + integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA== dependencies: lodash "^4.17.14" @@ -2954,9 +2954,9 @@ events@^3.0.0: integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg== eventsource@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0" - integrity sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ== + version "1.1.1" + resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.1.tgz#4544a35a57d7120fba4fa4c86cb4023b2c09df2f" + integrity sha512-qV5ZC0h7jYIAOhArFJgSfdyz6rALJyb270714o7ZtNnw2WSJ+eexhKtE0O8LYPRsHZHf2osHKZBxGPvm3kPkCA== dependencies: original "^1.0.0" @@ -4545,9 +4545,9 @@ minimatch@^3.0.4: brace-expansion "^1.1.7" minimist@^1.2.0, minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + version "1.2.6" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" + integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== minipass-collect@^1.0.2: version "1.0.2" @@ -4716,9 +4716,9 @@ node-fetch@2.6.7, node-fetch@^2.6.1: whatwg-url "^5.0.0" node-forge@^1.2.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.2.1.tgz#82794919071ef2eb5c509293325cec8afd0fd53c" - integrity sha512-Fcvtbb+zBcZXbTTVwqGA5W+MKBj56UjVRevvchv5XrcyXbmNdesfZL37nlcWOfpgHhgmxApw3tQbTr4CqNmX4w== + version "1.3.1" + resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" + integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA== node-libs-browser@^2.2.1: version "2.2.1"