Fix gems we'd locked to old versions
Now that we're on Ruby 2.6, the constraints on the latest versions of these dependencies are satisfied, so we can stop holding them back!
This commit is contained in:
parent
2c167c0280
commit
bc3a9bc33b
18 changed files with 25 additions and 20 deletions
10
Gemfile
10
Gemfile
|
@ -29,7 +29,7 @@ gem 'http_accept_language', '~> 2.1', '>= 2.1.1'
|
||||||
gem 'globalize', '~> 6.2', '>= 6.2.1'
|
gem 'globalize', '~> 6.2', '>= 6.2.1'
|
||||||
|
|
||||||
# For reading and parsing HTML from Neopets.com, like importing Closet pages.
|
# 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"
|
gem "rest-client", "~> 1.6.7"
|
||||||
|
|
||||||
# For safely rendering users' Markdown + HTML on item list pages.
|
# For safely rendering users' Markdown + HTML on item list pages.
|
||||||
|
@ -56,14 +56,6 @@ gem "parallel", "~> 1.13.0"
|
||||||
# For debugging.
|
# For debugging.
|
||||||
gem 'web-console', '~> 3.7'
|
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!
|
# TODO: Review our use of content_tag_for etc and uninstall this!
|
||||||
gem 'record_tag_helper', '~> 1.0'
|
gem 'record_tag_helper', '~> 1.0'
|
||||||
|
|
||||||
|
|
35
Gemfile.lock
35
Gemfile.lock
|
@ -85,6 +85,7 @@ GEM
|
||||||
concurrent-ruby (1.2.2)
|
concurrent-ruby (1.2.2)
|
||||||
connection_pool (2.2.5)
|
connection_pool (2.2.5)
|
||||||
crass (1.0.6)
|
crass (1.0.6)
|
||||||
|
date (3.3.3)
|
||||||
devise (4.9.2)
|
devise (4.9.2)
|
||||||
bcrypt (~> 3.0)
|
bcrypt (~> 3.0)
|
||||||
orm_adapter (~> 0.1)
|
orm_adapter (~> 0.1)
|
||||||
|
@ -122,35 +123,49 @@ GEM
|
||||||
addressable (~> 2.3)
|
addressable (~> 2.3)
|
||||||
letter_opener (1.4.1)
|
letter_opener (1.4.1)
|
||||||
launchy (~> 2.2)
|
launchy (~> 2.2)
|
||||||
loofah (2.20.0)
|
loofah (2.21.3)
|
||||||
crass (~> 1.0.2)
|
crass (~> 1.0.2)
|
||||||
nokogiri (>= 1.5.9)
|
nokogiri (>= 1.12.0)
|
||||||
mail (2.7.1)
|
mail (2.8.1)
|
||||||
mini_mime (>= 0.1.1)
|
mini_mime (>= 0.1.1)
|
||||||
|
net-imap
|
||||||
|
net-pop
|
||||||
|
net-smtp
|
||||||
marcel (1.0.2)
|
marcel (1.0.2)
|
||||||
memcache-client (1.8.5)
|
memcache-client (1.8.5)
|
||||||
method_source (1.0.0)
|
method_source (1.0.0)
|
||||||
mime-types (1.25.1)
|
mime-types (1.25.1)
|
||||||
mini_mime (1.1.2)
|
mini_mime (1.1.2)
|
||||||
mini_portile2 (2.4.0)
|
mini_portile2 (2.8.4)
|
||||||
minitest (5.15.0)
|
minitest (5.19.0)
|
||||||
msgpack (1.6.1)
|
msgpack (1.6.1)
|
||||||
multi_json (1.15.0)
|
multi_json (1.15.0)
|
||||||
mysql2 (0.5.5)
|
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-scp (1.0.4)
|
||||||
net-ssh (>= 1.99.1)
|
net-ssh (>= 1.99.1)
|
||||||
net-sftp (2.1.2)
|
net-sftp (2.1.2)
|
||||||
net-ssh (>= 2.6.5)
|
net-ssh (>= 2.6.5)
|
||||||
|
net-smtp (0.3.3)
|
||||||
|
net-protocol
|
||||||
net-ssh (2.9.2)
|
net-ssh (2.9.2)
|
||||||
net-ssh-gateway (1.2.0)
|
net-ssh-gateway (1.2.0)
|
||||||
net-ssh (>= 2.6.5)
|
net-ssh (>= 2.6.5)
|
||||||
nio4r (2.5.9)
|
nio4r (2.5.9)
|
||||||
nokogiri (1.10.10)
|
nokogiri (1.13.10)
|
||||||
mini_portile2 (~> 2.4.0)
|
mini_portile2 (~> 2.8.0)
|
||||||
|
racc (~> 1.4)
|
||||||
openneo-auth-signatory (0.1.0)
|
openneo-auth-signatory (0.1.0)
|
||||||
ruby-hmac
|
ruby-hmac
|
||||||
orm_adapter (0.5.0)
|
orm_adapter (0.5.0)
|
||||||
parallel (1.13.0)
|
parallel (1.13.0)
|
||||||
|
racc (1.7.1)
|
||||||
rack (2.2.8)
|
rack (2.2.8)
|
||||||
rack-attack (2.2.1)
|
rack-attack (2.2.1)
|
||||||
rack
|
rack
|
||||||
|
@ -239,6 +254,7 @@ GEM
|
||||||
thor (1.2.2)
|
thor (1.2.2)
|
||||||
thread_safe (0.3.6)
|
thread_safe (0.3.6)
|
||||||
tilt (2.2.0)
|
tilt (2.2.0)
|
||||||
|
timeout (0.4.0)
|
||||||
tzinfo (1.2.11)
|
tzinfo (1.2.11)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
uglifier (4.2.0)
|
uglifier (4.2.0)
|
||||||
|
@ -270,13 +286,10 @@ DEPENDENCIES
|
||||||
haml (~> 6.1, >= 6.1.1)
|
haml (~> 6.1, >= 6.1.1)
|
||||||
http_accept_language (~> 2.1, >= 2.1.1)
|
http_accept_language (~> 2.1, >= 2.1.1)
|
||||||
letter_opener
|
letter_opener
|
||||||
loofah (~> 2.20, < 2.21)
|
|
||||||
mail (~> 2.7, >= 2.7.1, < 2.8)
|
|
||||||
memcache-client (~> 1.8.5)
|
memcache-client (~> 1.8.5)
|
||||||
minitest (~> 5.15, < 5.16)
|
|
||||||
msgpack (~> 1.6, >= 1.6.1)
|
msgpack (~> 1.6, >= 1.6.1)
|
||||||
mysql2 (~> 0.5.5)
|
mysql2 (~> 0.5.5)
|
||||||
nokogiri (~> 1.10, >= 1.10.10)
|
nokogiri (~> 1.13, >= 1.13.10)
|
||||||
openneo-auth-signatory (~> 0.1.0)
|
openneo-auth-signatory (~> 0.1.0)
|
||||||
parallel (~> 1.13.0)
|
parallel (~> 1.13.0)
|
||||||
rack-attack (~> 2.2.0)
|
rack-attack (~> 2.2.0)
|
||||||
|
|
BIN
vendor/cache/date-3.3.3.gem
vendored
Normal file
BIN
vendor/cache/date-3.3.3.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/loofah-2.20.0.gem
vendored
BIN
vendor/cache/loofah-2.20.0.gem
vendored
Binary file not shown.
BIN
vendor/cache/loofah-2.21.3.gem
vendored
Normal file
BIN
vendor/cache/loofah-2.21.3.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/mail-2.7.1.gem
vendored
BIN
vendor/cache/mail-2.7.1.gem
vendored
Binary file not shown.
BIN
vendor/cache/mail-2.8.1.gem
vendored
Normal file
BIN
vendor/cache/mail-2.8.1.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/mini_portile2-2.4.0.gem
vendored
BIN
vendor/cache/mini_portile2-2.4.0.gem
vendored
Binary file not shown.
BIN
vendor/cache/minitest-5.15.0.gem
vendored
BIN
vendor/cache/minitest-5.15.0.gem
vendored
Binary file not shown.
BIN
vendor/cache/minitest-5.19.0.gem
vendored
Normal file
BIN
vendor/cache/minitest-5.19.0.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/net-imap-0.3.7.gem
vendored
Normal file
BIN
vendor/cache/net-imap-0.3.7.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/net-pop-0.1.2.gem
vendored
Normal file
BIN
vendor/cache/net-pop-0.1.2.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/net-protocol-0.2.1.gem
vendored
Normal file
BIN
vendor/cache/net-protocol-0.2.1.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/net-smtp-0.3.3.gem
vendored
Normal file
BIN
vendor/cache/net-smtp-0.3.3.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/nokogiri-1.10.10.gem
vendored
BIN
vendor/cache/nokogiri-1.10.10.gem
vendored
Binary file not shown.
BIN
vendor/cache/nokogiri-1.13.10-x86_64-linux.gem
vendored
Normal file
BIN
vendor/cache/nokogiri-1.13.10-x86_64-linux.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/racc-1.7.1.gem
vendored
Normal file
BIN
vendor/cache/racc-1.7.1.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/timeout-0.4.0.gem
vendored
Normal file
BIN
vendor/cache/timeout-0.4.0.gem
vendored
Normal file
Binary file not shown.
Loading…
Reference in a new issue