From 48001c129348d149997b7e7b9196ee80202dcc13 Mon Sep 17 00:00:00 2001 From: evazion Date: Fri, 16 Jun 2017 00:35:29 -0500 Subject: [PATCH] gems: update sanitize to 4.5.0; add addressable. --- Gemfile | 3 ++- Gemfile.lock | 21 +++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index 55b79268c..e4178086a 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,7 @@ gem "delayed_job_active_record" gem "simple_form" gem "mechanize" gem "whenever", :require => false -gem "sanitize", "~> 3.1.0" +gem "sanitize" gem 'rmagick' gem 'net-sftp' gem 'term-ansicolor', :require => "term/ansicolor" @@ -44,6 +44,7 @@ gem 'memoist' gem 'daemons' gem 'oauth2' gem 'bootsnap' +gem 'addressable' # needed for looser jpeg header compat gem 'ruby-imagespec', :require => "image_spec", :git => "https://github.com/r888888888/ruby-imagespec.git", :branch => "exif-fixes" diff --git a/Gemfile.lock b/Gemfile.lock index ada2548ef..45f0286b8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -199,7 +199,7 @@ GEM metaclass (0.0.4) method_source (0.8.2) mime-types (2.99.3) - mini_portile2 (2.1.0) + mini_portile2 (2.2.0) minitest (5.10.1) mocha (1.2.1) metaclass (~> 0.0.1) @@ -218,11 +218,11 @@ GEM net-ssh (2.9.2) netrc (0.10.3) newrelic_rpm (3.13.0.299) - nokogiri (1.7.0.1) - mini_portile2 (~> 2.1.0) - nokogiri (1.7.0.1-x64-mingw32) - mini_portile2 (~> 2.1.0) - nokogumbo (1.2.0) + nokogiri (1.8.0) + mini_portile2 (~> 2.2.0) + nokogiri (1.8.0-x64-mingw32) + mini_portile2 (~> 2.2.0) + nokogumbo (1.4.13) nokogiri ntlm-http (0.1.1) oauth2 (1.3.0) @@ -292,10 +292,10 @@ GEM rmagick (2.16.0) ruby-prof (0.15.8) rubyzip (1.1.7) - sanitize (3.1.2) - crass (~> 1.0.1) + sanitize (4.5.0) + crass (~> 1.0.2) nokogiri (>= 1.4.4) - nokogumbo (= 1.2.0) + nokogumbo (~> 1.4.1) sass (3.4.23) sass-rails (5.0.6) railties (>= 4.0.0, < 6) @@ -387,6 +387,7 @@ PLATFORMS x64-mingw32 DEPENDENCIES + addressable awesome_print aws-sdk (~> 2) bcrypt-ruby @@ -429,7 +430,7 @@ DEPENDENCIES ruby-imagespec! ruby-prof rubyzip - sanitize (~> 3.1.0) + sanitize sass-rails shoulda-context shoulda-matchers