diff --git a/Gemfile b/Gemfile index 47de8e1a5b476..761ff63c4969f 100644 --- a/Gemfile +++ b/Gemfile @@ -125,7 +125,7 @@ group :development do gem "bundler-audit", "~> 0.9" # bundler-audit provides patch-level verification for Bundled apps gem "derailed_benchmarks", "~> 2.1", require: false # A series of things you can use to benchmark a Rails or Ruby app gem "easy_translate", "~> 0.5.1" # Google translate tie-in to be used with i18n tasks - gem "erb_lint", "~> 0.0.37", require: false # ERB Linter tool + gem "erb_lint", "~> 0.3.0", require: false # ERB Linter tool gem "guard", "~> 2.18", require: false # Guard is a command line tool to easily handle events on file system modifications gem "guard-livereload", "~> 2.5", require: false # Guard::LiveReload automatically reloads your browser when 'view' files are modified gem "i18n-tasks", "~> 0.9.34" # Helpers to find and manage missing and unused translations diff --git a/Gemfile.lock b/Gemfile.lock index 6adb119d0e3bd..790a11a7457db 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -112,12 +112,11 @@ GEM coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) - better_html (1.0.16) - actionview (>= 4.0) - activesupport (>= 4.0) + better_html (2.0.1) + actionview (>= 6.0) + activesupport (>= 6.0) ast (~> 2.0) erubi (~> 1.4) - html_tokenizer (~> 0.0.6) parser (>= 2.4) smart_properties bindex (0.8.1) @@ -177,7 +176,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.9) + concurrent-ruby (1.1.10) connection_pool (2.2.5) counter_culture (3.0.0) activerecord (>= 4.2) @@ -235,16 +234,15 @@ GEM activemodel emoji_regex (3.2.3) equalizer (0.0.11) - erb_lint (0.0.37) + erb_lint (0.3.0) activesupport - better_html (~> 1.0.7) - html_tokenizer + better_html (>= 2.0.1) parser (>= 2.7.1.4) rainbow rubocop smart_properties errbase (0.2.1) - erubi (1.10.0) + erubi (1.11.0) et-orbi (1.2.4) tzinfo eventmachine (1.2.7) @@ -362,7 +360,6 @@ GEM honeybadger (4.9.0) honeycomb-beeline (2.7.1) libhoney (~> 1.14, >= 1.14.2) - html_tokenizer (0.0.7) html_truncator (0.4.2) nokogiri (~> 1.5) htmlentities (4.3.4) @@ -385,7 +382,7 @@ GEM httpclient (2.8.3) hypershield (0.2.2) activerecord (>= 5) - i18n (1.8.10) + i18n (1.12.0) concurrent-ruby (~> 1.0) i18n-js (3.9.0) i18n (>= 0.6.6) @@ -447,7 +444,7 @@ GEM listen (3.7.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.12.0) + loofah (2.19.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.2.8) @@ -465,8 +462,8 @@ GEM mini_histogram (0.3.1) mini_magick (4.11.0) mini_mime (1.1.2) - mini_portile2 (2.6.1) - minitest (5.14.4) + mini_portile2 (2.8.0) + minitest (5.16.3) modis (4.0.0) activemodel (>= 5.2) activesupport (>= 5.2) @@ -486,14 +483,14 @@ GEM http-2 (~> 0.11) netrc (0.11.0) nio4r (2.5.8) - nokogiri (1.12.5) - mini_portile2 (~> 2.6.1) + nokogiri (1.13.9) + mini_portile2 (~> 2.8.0) racc (~> 1.4) - nokogiri (1.12.5-arm64-darwin) + nokogiri (1.13.9-arm64-darwin) racc (~> 1.4) - nokogiri (1.12.5-x86_64-darwin) + nokogiri (1.13.9-x86_64-darwin) racc (~> 1.4) - nokogiri (1.12.5-x86_64-linux) + nokogiri (1.13.9-x86_64-linux) racc (~> 1.4) notiffany (0.1.3) nenv (~> 0.1) @@ -535,7 +532,7 @@ GEM rack orm_adapter (0.5.0) parallel (1.21.0) - parser (3.0.2.0) + parser (3.1.2.1) ast (~> 2.4.1) patron (0.13.3) pg (1.2.3) @@ -593,7 +590,7 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.2) + rails-html-sanitizer (1.4.3) loofah (~> 2.3) rails-i18n (6.0.0) i18n (>= 0.7, < 2) @@ -604,7 +601,7 @@ GEM method_source rake (>= 0.13) thor (~> 1.0) - rainbow (3.0.0) + rainbow (3.1.1) rake (13.0.6) ransack (2.4.2) activerecord (>= 5.2.4) @@ -633,7 +630,7 @@ GEM redis-store (>= 1.2, < 2) redis-store (1.9.0) redis (>= 4, < 5) - regexp_parser (2.1.1) + regexp_parser (2.6.0) request_store (1.5.0) rack (>= 1.4) responders (3.0.1) @@ -692,8 +689,8 @@ GEM rubocop-ast (>= 1.12.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.12.0) - parser (>= 3.0.1.1) + rubocop-ast (1.23.0) + parser (>= 3.1.1.0) rubocop-performance (1.12.0) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -771,7 +768,7 @@ GEM simplecov-html (0.12.3) simplecov_json_formatter (0.1.2) slack-notifier (2.4.0) - smart_properties (1.15.0) + smart_properties (1.17.0) spring (3.0.0) spring-commands-rspec (1.0.4) spring (>= 0.9.1) @@ -818,7 +815,7 @@ GEM multipart-post (~> 2.0) naught (~> 1.0) simple_oauth (~> 0.3.0) - tzinfo (2.0.4) + tzinfo (2.0.5) concurrent-ruby (~> 1.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) @@ -826,7 +823,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.8) - unicode-display_width (2.1.0) + unicode-display_width (2.3.0) uniform_notifier (1.14.2) validate_url (1.0.13) activemodel (>= 3.0.0) @@ -873,7 +870,7 @@ GEM activerecord (>= 5.2) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.5.1) + zeitwerk (2.6.4) zonebie (0.6.1) PLATFORMS @@ -914,7 +911,7 @@ DEPENDENCIES easy_translate (~> 0.5.1) email_validator (~> 2.2) emoji_regex (~> 3.2) - erb_lint (~> 0.0.37) + erb_lint (~> 0.3.0) exifr (>= 1.3.6) factory_bot_rails (~> 6.2) faker (~> 2.19) diff --git a/vendor/cache/better_html-1.0.16.gem b/vendor/cache/better_html-1.0.16.gem deleted file mode 100644 index bda1caa530b15..0000000000000 Binary files a/vendor/cache/better_html-1.0.16.gem and /dev/null differ diff --git a/vendor/cache/better_html-2.0.1.gem b/vendor/cache/better_html-2.0.1.gem new file mode 100644 index 0000000000000..f02e9e4198638 Binary files /dev/null and b/vendor/cache/better_html-2.0.1.gem differ diff --git a/vendor/cache/concurrent-ruby-1.1.10.gem b/vendor/cache/concurrent-ruby-1.1.10.gem new file mode 100644 index 0000000000000..c796701bee261 Binary files /dev/null and b/vendor/cache/concurrent-ruby-1.1.10.gem differ diff --git a/vendor/cache/concurrent-ruby-1.1.9.gem b/vendor/cache/concurrent-ruby-1.1.9.gem deleted file mode 100644 index 9ed64f26c74f4..0000000000000 Binary files a/vendor/cache/concurrent-ruby-1.1.9.gem and /dev/null differ diff --git a/vendor/cache/erb_lint-0.0.37.gem b/vendor/cache/erb_lint-0.0.37.gem deleted file mode 100644 index 05b6ad929eb70..0000000000000 Binary files a/vendor/cache/erb_lint-0.0.37.gem and /dev/null differ diff --git a/vendor/cache/erb_lint-0.3.0.gem b/vendor/cache/erb_lint-0.3.0.gem new file mode 100644 index 0000000000000..18731eecf2fc9 Binary files /dev/null and b/vendor/cache/erb_lint-0.3.0.gem differ diff --git a/vendor/cache/erubi-1.10.0.gem b/vendor/cache/erubi-1.10.0.gem deleted file mode 100644 index 31894cf32afc1..0000000000000 Binary files a/vendor/cache/erubi-1.10.0.gem and /dev/null differ diff --git a/vendor/cache/erubi-1.11.0.gem b/vendor/cache/erubi-1.11.0.gem new file mode 100644 index 0000000000000..4caea75922138 Binary files /dev/null and b/vendor/cache/erubi-1.11.0.gem differ diff --git a/vendor/cache/html_tokenizer-0.0.7.gem b/vendor/cache/html_tokenizer-0.0.7.gem deleted file mode 100644 index c673744d03560..0000000000000 Binary files a/vendor/cache/html_tokenizer-0.0.7.gem and /dev/null differ diff --git a/vendor/cache/i18n-1.12.0.gem b/vendor/cache/i18n-1.12.0.gem new file mode 100644 index 0000000000000..c64c068e63c86 Binary files /dev/null and b/vendor/cache/i18n-1.12.0.gem differ diff --git a/vendor/cache/i18n-1.8.10.gem b/vendor/cache/i18n-1.8.10.gem deleted file mode 100644 index 7dd1339024227..0000000000000 Binary files a/vendor/cache/i18n-1.8.10.gem and /dev/null differ diff --git a/vendor/cache/loofah-2.12.0.gem b/vendor/cache/loofah-2.12.0.gem deleted file mode 100644 index edf8cf6b08235..0000000000000 Binary files a/vendor/cache/loofah-2.12.0.gem and /dev/null differ diff --git a/vendor/cache/loofah-2.19.0.gem b/vendor/cache/loofah-2.19.0.gem new file mode 100644 index 0000000000000..025b88df7a88e Binary files /dev/null and b/vendor/cache/loofah-2.19.0.gem differ diff --git a/vendor/cache/mini_portile2-2.6.1.gem b/vendor/cache/mini_portile2-2.6.1.gem deleted file mode 100644 index 3e5b08d4a8003..0000000000000 Binary files a/vendor/cache/mini_portile2-2.6.1.gem and /dev/null differ diff --git a/vendor/cache/mini_portile2-2.8.0.gem b/vendor/cache/mini_portile2-2.8.0.gem new file mode 100644 index 0000000000000..41f04a4409c85 Binary files /dev/null and b/vendor/cache/mini_portile2-2.8.0.gem differ diff --git a/vendor/cache/minitest-5.14.4.gem b/vendor/cache/minitest-5.14.4.gem deleted file mode 100644 index 6a7369480468d..0000000000000 Binary files a/vendor/cache/minitest-5.14.4.gem and /dev/null differ diff --git a/vendor/cache/minitest-5.16.3.gem b/vendor/cache/minitest-5.16.3.gem new file mode 100644 index 0000000000000..ebdb92e36c281 Binary files /dev/null and b/vendor/cache/minitest-5.16.3.gem differ diff --git a/vendor/cache/nokogiri-1.12.5-arm64-darwin.gem b/vendor/cache/nokogiri-1.12.5-arm64-darwin.gem deleted file mode 100644 index c99f62e8d90e8..0000000000000 Binary files a/vendor/cache/nokogiri-1.12.5-arm64-darwin.gem and /dev/null differ diff --git a/vendor/cache/nokogiri-1.12.5-x86_64-darwin.gem b/vendor/cache/nokogiri-1.12.5-x86_64-darwin.gem deleted file mode 100644 index b70705eeaa79f..0000000000000 Binary files a/vendor/cache/nokogiri-1.12.5-x86_64-darwin.gem and /dev/null differ diff --git a/vendor/cache/nokogiri-1.12.5-x86_64-linux.gem b/vendor/cache/nokogiri-1.12.5-x86_64-linux.gem deleted file mode 100644 index ff9445c1e3595..0000000000000 Binary files a/vendor/cache/nokogiri-1.12.5-x86_64-linux.gem and /dev/null differ diff --git a/vendor/cache/nokogiri-1.12.5.gem b/vendor/cache/nokogiri-1.12.5.gem deleted file mode 100644 index 5ece6d833e90a..0000000000000 Binary files a/vendor/cache/nokogiri-1.12.5.gem and /dev/null differ diff --git a/vendor/cache/nokogiri-1.13.9-arm64-darwin.gem b/vendor/cache/nokogiri-1.13.9-arm64-darwin.gem new file mode 100644 index 0000000000000..951da0c0b5907 Binary files /dev/null and b/vendor/cache/nokogiri-1.13.9-arm64-darwin.gem differ diff --git a/vendor/cache/nokogiri-1.13.9-x86_64-darwin.gem b/vendor/cache/nokogiri-1.13.9-x86_64-darwin.gem new file mode 100644 index 0000000000000..2b2dbcb4742e2 Binary files /dev/null and b/vendor/cache/nokogiri-1.13.9-x86_64-darwin.gem differ diff --git a/vendor/cache/nokogiri-1.13.9-x86_64-linux.gem b/vendor/cache/nokogiri-1.13.9-x86_64-linux.gem new file mode 100644 index 0000000000000..266ae3e3efdce Binary files /dev/null and b/vendor/cache/nokogiri-1.13.9-x86_64-linux.gem differ diff --git a/vendor/cache/nokogiri-1.13.9.gem b/vendor/cache/nokogiri-1.13.9.gem new file mode 100644 index 0000000000000..50e0aa62878e9 Binary files /dev/null and b/vendor/cache/nokogiri-1.13.9.gem differ diff --git a/vendor/cache/parser-3.0.2.0.gem b/vendor/cache/parser-3.0.2.0.gem deleted file mode 100644 index ee615aaa86b8d..0000000000000 Binary files a/vendor/cache/parser-3.0.2.0.gem and /dev/null differ diff --git a/vendor/cache/parser-3.1.2.1.gem b/vendor/cache/parser-3.1.2.1.gem new file mode 100644 index 0000000000000..7b71167cb29a3 Binary files /dev/null and b/vendor/cache/parser-3.1.2.1.gem differ diff --git a/vendor/cache/rails-html-sanitizer-1.4.2.gem b/vendor/cache/rails-html-sanitizer-1.4.2.gem deleted file mode 100644 index aab9fa6cfb716..0000000000000 Binary files a/vendor/cache/rails-html-sanitizer-1.4.2.gem and /dev/null differ diff --git a/vendor/cache/rails-html-sanitizer-1.4.3.gem b/vendor/cache/rails-html-sanitizer-1.4.3.gem new file mode 100644 index 0000000000000..ae2042113974c Binary files /dev/null and b/vendor/cache/rails-html-sanitizer-1.4.3.gem differ diff --git a/vendor/cache/rainbow-3.0.0.gem b/vendor/cache/rainbow-3.0.0.gem deleted file mode 100644 index c53caf7afa806..0000000000000 Binary files a/vendor/cache/rainbow-3.0.0.gem and /dev/null differ diff --git a/vendor/cache/rainbow-3.1.1.gem b/vendor/cache/rainbow-3.1.1.gem new file mode 100644 index 0000000000000..863181a2e77bc Binary files /dev/null and b/vendor/cache/rainbow-3.1.1.gem differ diff --git a/vendor/cache/regexp_parser-2.1.1.gem b/vendor/cache/regexp_parser-2.1.1.gem deleted file mode 100644 index 4bb25a0eeb83c..0000000000000 Binary files a/vendor/cache/regexp_parser-2.1.1.gem and /dev/null differ diff --git a/vendor/cache/regexp_parser-2.6.0.gem b/vendor/cache/regexp_parser-2.6.0.gem new file mode 100644 index 0000000000000..dd2a2b8a2ee0e Binary files /dev/null and b/vendor/cache/regexp_parser-2.6.0.gem differ diff --git a/vendor/cache/rubocop-ast-1.12.0.gem b/vendor/cache/rubocop-ast-1.12.0.gem deleted file mode 100644 index efa3bccc85999..0000000000000 Binary files a/vendor/cache/rubocop-ast-1.12.0.gem and /dev/null differ diff --git a/vendor/cache/rubocop-ast-1.23.0.gem b/vendor/cache/rubocop-ast-1.23.0.gem new file mode 100644 index 0000000000000..476208bf87317 Binary files /dev/null and b/vendor/cache/rubocop-ast-1.23.0.gem differ diff --git a/vendor/cache/smart_properties-1.15.0.gem b/vendor/cache/smart_properties-1.15.0.gem deleted file mode 100644 index 46ec3c2a7ddc7..0000000000000 Binary files a/vendor/cache/smart_properties-1.15.0.gem and /dev/null differ diff --git a/vendor/cache/smart_properties-1.17.0.gem b/vendor/cache/smart_properties-1.17.0.gem new file mode 100644 index 0000000000000..e18fee7644f9c Binary files /dev/null and b/vendor/cache/smart_properties-1.17.0.gem differ diff --git a/vendor/cache/tzinfo-2.0.4.gem b/vendor/cache/tzinfo-2.0.4.gem deleted file mode 100644 index a3f982055a81b..0000000000000 Binary files a/vendor/cache/tzinfo-2.0.4.gem and /dev/null differ diff --git a/vendor/cache/tzinfo-2.0.5.gem b/vendor/cache/tzinfo-2.0.5.gem new file mode 100644 index 0000000000000..1b28f07d2762a Binary files /dev/null and b/vendor/cache/tzinfo-2.0.5.gem differ diff --git a/vendor/cache/unicode-display_width-2.1.0.gem b/vendor/cache/unicode-display_width-2.1.0.gem deleted file mode 100644 index bec8f2a7c22b0..0000000000000 Binary files a/vendor/cache/unicode-display_width-2.1.0.gem and /dev/null differ diff --git a/vendor/cache/unicode-display_width-2.3.0.gem b/vendor/cache/unicode-display_width-2.3.0.gem new file mode 100644 index 0000000000000..c8551a4fdf1f8 Binary files /dev/null and b/vendor/cache/unicode-display_width-2.3.0.gem differ diff --git a/vendor/cache/zeitwerk-2.5.1.gem b/vendor/cache/zeitwerk-2.5.1.gem deleted file mode 100644 index 0d7b3d8366b66..0000000000000 Binary files a/vendor/cache/zeitwerk-2.5.1.gem and /dev/null differ diff --git a/vendor/cache/zeitwerk-2.6.4.gem b/vendor/cache/zeitwerk-2.6.4.gem new file mode 100644 index 0000000000000..84c613faf40ac Binary files /dev/null and b/vendor/cache/zeitwerk-2.6.4.gem differ