jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix build failure in nokogumbo.

Browse Source 
Nokogumbo-2.0.2 fails to build when Nokogiri-1.11.0 is installed.
Nokogiri introduced some changes that are apparently incompatible with
Nokogumbo.

ref: https://nokogiri.org/CHANGELOG.html#versioninfo-and-the-output-of-nokogiri-v
This commit is contained in:
evazion
2020-06-09 13:20:46 -05:00
parent 8b5ffb4c43
commit 20abd8a5fd
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Gemfile
View File

@@ -48,6 +48,9 @@ gem 'activerecord-hierarchical_query'
gem 'pundit' gem 'pundit'
gem 'mail' gem 'mail'
# locked to 1.10.9 to workaround an incompatibility with nokogumbo 2.0.2.
gem 'nokogiri', '~> 1.10.9'
group :production, :staging do group :production, :staging do
gem 'unicorn', :platforms => :ruby gem 'unicorn', :platforms => :ruby
gem 'capistrano3-unicorn' gem 'capistrano3-unicorn'

10
Gemfile.lock
View File

@@ -210,7 +210,7 @@ GEM
mime-types-data (3.2020.0512) mime-types-data (3.2020.0512)
mimemagic (0.3.5) mimemagic (0.3.5)
mini_mime (1.0.2) mini_mime (1.0.2)
mini_portile2 (2.5.0) mini_portile2 (2.4.0)
minitest (5.14.1) minitest (5.14.1)
minitest-ci (3.4.0) minitest-ci (3.4.0)
minitest (>= 5.0.6) minitest (>= 5.0.6)
@@ -233,9 +233,10 @@ GEM
net-ssh (6.0.2) net-ssh (6.0.2)
newrelic_rpm (6.11.0.365) newrelic_rpm (6.11.0.365)
nio4r (2.5.2) nio4r (2.5.2)
nokogiri (1.11.0.rc2) nokogiri (1.10.9)
mini_portile2 (~> 2.5.0) mini_portile2 (~> 2.4.0)
nokogiri (1.11.0.rc2-x64-mingw32) nokogiri (1.10.9-x64-mingw32)
mini_portile2 (~> 2.4.0)
nokogumbo (2.0.2) nokogumbo (2.0.2)
nokogiri (~> 1.8, >= 1.8.4) nokogiri (~> 1.8, >= 1.8.4)
ntlm-http (0.1.1) ntlm-http (0.1.1)
@@ -456,6 +457,7 @@ DEPENDENCIES
mock_redis mock_redis
net-sftp net-sftp
newrelic_rpm newrelic_rpm
nokogiri (~> 1.10.9)
oauth2 oauth2
pg pg
pry-byebug pry-byebug