From b40ea6d1d44a5f43ecf81e0690a79a7eff34204b Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 29 Oct 2018 14:05:25 +0100 Subject: [PATCH] Bump sanitize from 4.6.6 to 5.0.0 (#9140) --- Gemfile | 2 +- Gemfile.lock | 12 ++++++------ spec/lib/formatter_spec.rb | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index 452daab9ee0..3ffb0140f89 100644 --- a/Gemfile +++ b/Gemfile @@ -72,7 +72,7 @@ gem 'rails-settings-cached', '~> 0.6' gem 'redis', '~> 4.0', require: ['redis', 'redis/connection/hiredis'] gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock' gem 'rqrcode', '~> 0.10' -gem 'sanitize', '~> 4.6' +gem 'sanitize', '~> 5.0' gem 'sidekiq', '~> 5.2' gem 'sidekiq-scheduler', '~> 3.0' gem 'sidekiq-unique-jobs', '~> 5.0' diff --git a/Gemfile.lock b/Gemfile.lock index b5432bb016b..b0efd1bfb91 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -360,8 +360,8 @@ GEM nio4r (2.3.1) nokogiri (1.8.5) mini_portile2 (~> 2.3.0) - nokogumbo (1.5.0) - nokogiri + nokogumbo (2.0.0) + nokogiri (~> 1.8, >= 1.8.4) nsa (0.2.4) activesupport (>= 4.2, < 6) concurrent-ruby (~> 1.0.0) @@ -543,10 +543,10 @@ GEM rufus-scheduler (3.5.2) fugit (~> 1.1, >= 1.1.5) safe_yaml (1.0.4) - sanitize (4.6.6) + sanitize (5.0.0) crass (~> 1.0.2) - nokogiri (>= 1.4.4) - nokogumbo (~> 1.4) + nokogiri (>= 1.8.0) + nokogumbo (~> 2.0) sass (3.6.0) sass-listen (~> 4.0.0) sass-listen (4.0.0) @@ -749,7 +749,7 @@ DEPENDENCIES rspec-rails (~> 3.8) rspec-sidekiq (~> 3.0) rubocop (~> 0.60) - sanitize (~> 4.6) + sanitize (~> 5.0) scss_lint (~> 0.57) sidekiq (~> 5.2) sidekiq-bulk (~> 0.1.1) diff --git a/spec/lib/formatter_spec.rb b/spec/lib/formatter_spec.rb index ec4a6493df8..0c1efe7c3cc 100644 --- a/spec/lib/formatter_spec.rb +++ b/spec/lib/formatter_spec.rb @@ -514,7 +514,7 @@ RSpec.describe Formatter do subject { Formatter.instance.sanitize(html, Sanitize::Config::MASTODON_STRICT) } it 'sanitizes' do - is_expected.to eq 'alert("Hello")' + is_expected.to eq '' end end end