diff --git a/Gemfile b/Gemfile index 9277db09..33a86a0b 100644 --- a/Gemfile +++ b/Gemfile @@ -29,7 +29,7 @@ gem 'http_accept_language', '~> 2.1', '>= 2.1.1' gem 'globalize', '~> 6.2', '>= 6.2.1' # For reading and parsing HTML from Neopets.com, like importing Closet pages. -gem 'nokogiri', '~> 1.10', '>= 1.10.10' +gem 'nokogiri', '~> 1.13', '>= 1.13.10' gem "rest-client", "~> 1.6.7" # For safely rendering users' Markdown + HTML on item list pages. @@ -56,14 +56,6 @@ gem "parallel", "~> 1.13.0" # For debugging. gem 'web-console', '~> 3.7' -# TODO: Rails requests the latest version of these dependencies, but they -# require Ruby 2.5 or higher, so we have to request lower ones instead! -# (loofah is slightly trickier: it requires a recent nokogiri, but recent -# nokogiri requires Ruby 2.6, so, yeah.) -gem 'loofah', '~> 2.20', '< 2.21' -gem 'minitest', '~> 5.15', '< 5.16' -gem 'mail', '~> 2.7', '>= 2.7.1', '< 2.8' - # TODO: Review our use of content_tag_for etc and uninstall this! gem 'record_tag_helper', '~> 1.0' diff --git a/Gemfile.lock b/Gemfile.lock index e78e38eb..f93943a8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -85,6 +85,7 @@ GEM concurrent-ruby (1.2.2) connection_pool (2.2.5) crass (1.0.6) + date (3.3.3) devise (4.9.2) bcrypt (~> 3.0) orm_adapter (~> 0.1) @@ -122,35 +123,49 @@ GEM addressable (~> 2.3) letter_opener (1.4.1) launchy (~> 2.2) - loofah (2.20.0) + loofah (2.21.3) crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) + nokogiri (>= 1.12.0) + mail (2.8.1) mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp marcel (1.0.2) memcache-client (1.8.5) method_source (1.0.0) mime-types (1.25.1) mini_mime (1.1.2) - mini_portile2 (2.4.0) - minitest (5.15.0) + mini_portile2 (2.8.4) + minitest (5.19.0) msgpack (1.6.1) multi_json (1.15.0) mysql2 (0.5.5) + net-imap (0.3.7) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.1) + timeout net-scp (1.0.4) net-ssh (>= 1.99.1) net-sftp (2.1.2) net-ssh (>= 2.6.5) + net-smtp (0.3.3) + net-protocol net-ssh (2.9.2) net-ssh-gateway (1.2.0) net-ssh (>= 2.6.5) nio4r (2.5.9) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) + nokogiri (1.13.10) + mini_portile2 (~> 2.8.0) + racc (~> 1.4) openneo-auth-signatory (0.1.0) ruby-hmac orm_adapter (0.5.0) parallel (1.13.0) + racc (1.7.1) rack (2.2.8) rack-attack (2.2.1) rack @@ -239,6 +254,7 @@ GEM thor (1.2.2) thread_safe (0.3.6) tilt (2.2.0) + timeout (0.4.0) tzinfo (1.2.11) thread_safe (~> 0.1) uglifier (4.2.0) @@ -270,13 +286,10 @@ DEPENDENCIES haml (~> 6.1, >= 6.1.1) http_accept_language (~> 2.1, >= 2.1.1) letter_opener - loofah (~> 2.20, < 2.21) - mail (~> 2.7, >= 2.7.1, < 2.8) memcache-client (~> 1.8.5) - minitest (~> 5.15, < 5.16) msgpack (~> 1.6, >= 1.6.1) mysql2 (~> 0.5.5) - nokogiri (~> 1.10, >= 1.10.10) + nokogiri (~> 1.13, >= 1.13.10) openneo-auth-signatory (~> 0.1.0) parallel (~> 1.13.0) rack-attack (~> 2.2.0) diff --git a/vendor/cache/date-3.3.3.gem b/vendor/cache/date-3.3.3.gem new file mode 100644 index 00000000..d4bc1234 Binary files /dev/null and b/vendor/cache/date-3.3.3.gem differ diff --git a/vendor/cache/loofah-2.20.0.gem b/vendor/cache/loofah-2.20.0.gem deleted file mode 100644 index f53303a6..00000000 Binary files a/vendor/cache/loofah-2.20.0.gem and /dev/null differ diff --git a/vendor/cache/loofah-2.21.3.gem b/vendor/cache/loofah-2.21.3.gem new file mode 100644 index 00000000..dd971670 Binary files /dev/null and b/vendor/cache/loofah-2.21.3.gem differ diff --git a/vendor/cache/mail-2.7.1.gem b/vendor/cache/mail-2.7.1.gem deleted file mode 100644 index 066ef0f0..00000000 Binary files a/vendor/cache/mail-2.7.1.gem and /dev/null differ diff --git a/vendor/cache/mail-2.8.1.gem b/vendor/cache/mail-2.8.1.gem new file mode 100644 index 00000000..2c69b3e6 Binary files /dev/null and b/vendor/cache/mail-2.8.1.gem differ diff --git a/vendor/cache/mini_portile2-2.4.0.gem b/vendor/cache/mini_portile2-2.4.0.gem deleted file mode 100644 index 2d3f3478..00000000 Binary files a/vendor/cache/mini_portile2-2.4.0.gem and /dev/null differ diff --git a/vendor/cache/minitest-5.15.0.gem b/vendor/cache/minitest-5.15.0.gem deleted file mode 100644 index bb3c2475..00000000 Binary files a/vendor/cache/minitest-5.15.0.gem and /dev/null differ diff --git a/vendor/cache/minitest-5.19.0.gem b/vendor/cache/minitest-5.19.0.gem new file mode 100644 index 00000000..2b14e41e Binary files /dev/null and b/vendor/cache/minitest-5.19.0.gem differ diff --git a/vendor/cache/net-imap-0.3.7.gem b/vendor/cache/net-imap-0.3.7.gem new file mode 100644 index 00000000..aff2aa13 Binary files /dev/null and b/vendor/cache/net-imap-0.3.7.gem differ diff --git a/vendor/cache/net-pop-0.1.2.gem b/vendor/cache/net-pop-0.1.2.gem new file mode 100644 index 00000000..98bcdb7e Binary files /dev/null and b/vendor/cache/net-pop-0.1.2.gem differ diff --git a/vendor/cache/net-protocol-0.2.1.gem b/vendor/cache/net-protocol-0.2.1.gem new file mode 100644 index 00000000..60b8794b Binary files /dev/null and b/vendor/cache/net-protocol-0.2.1.gem differ diff --git a/vendor/cache/net-smtp-0.3.3.gem b/vendor/cache/net-smtp-0.3.3.gem new file mode 100644 index 00000000..09fd408d Binary files /dev/null and b/vendor/cache/net-smtp-0.3.3.gem differ diff --git a/vendor/cache/nokogiri-1.10.10.gem b/vendor/cache/nokogiri-1.10.10.gem deleted file mode 100644 index 655364f2..00000000 Binary files a/vendor/cache/nokogiri-1.10.10.gem and /dev/null differ diff --git a/vendor/cache/nokogiri-1.13.10-x86_64-linux.gem b/vendor/cache/nokogiri-1.13.10-x86_64-linux.gem new file mode 100644 index 00000000..8a7f2b6a Binary files /dev/null and b/vendor/cache/nokogiri-1.13.10-x86_64-linux.gem differ diff --git a/vendor/cache/racc-1.7.1.gem b/vendor/cache/racc-1.7.1.gem new file mode 100644 index 00000000..c2552957 Binary files /dev/null and b/vendor/cache/racc-1.7.1.gem differ diff --git a/vendor/cache/timeout-0.4.0.gem b/vendor/cache/timeout-0.4.0.gem new file mode 100644 index 00000000..3253fb5e Binary files /dev/null and b/vendor/cache/timeout-0.4.0.gem differ