From 53744d31047cffab8ec5e0a4589d8fdbc6beeaab Mon Sep 17 00:00:00 2001 From: Melanie Sumner Date: Mon, 20 Aug 2018 18:44:52 -0400 Subject: [PATCH] update rails dependencies (#3517) * trying to update the rails-html-sanitizer gem * more gem updates --- Gemfile | 3 ++- Gemfile.lock | 51 ++++++++++++++++++++++++++------------------------- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/Gemfile b/Gemfile index a9de3e8a33..82c4fd60b6 100644 --- a/Gemfile +++ b/Gemfile @@ -22,7 +22,8 @@ gem 'bootstrap-sass', '~> 3.3.7' gem 'sass-rails', '>= 3.2' gem 'middleman-bootstrap-navbar' gem 'eventmachine', '1.0.9.1' -gem 'loofah', '2.2.1' +gem 'loofah', ">= 2.2.2" +gem 'rails-html-sanitizer', '>= 1.0.4' group :development, :test do gem 'pry' diff --git a/Gemfile.lock b/Gemfile.lock index ddee05ae92..613cc01b0a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -16,20 +16,20 @@ GIT GEM remote: https://rubygems.org/ specs: - actionpack (4.2.9) - actionview (= 4.2.9) - activesupport (= 4.2.9) + actionpack (4.2.10) + actionview (= 4.2.10) + activesupport (= 4.2.10) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.9) - activesupport (= 4.2.9) + actionview (4.2.10) + activesupport (= 4.2.10) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activesupport (4.2.9) + activesupport (4.2.10) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) @@ -74,7 +74,7 @@ GEM sass (>= 3.3.0, < 3.5) compass-import-once (1.0.5) sass (>= 3.2, < 3.5) - crass (1.0.3) + crass (1.0.4) daemons (1.2.4) debugger-linecache (1.2.0) diff-lcs (1.2.5) @@ -102,7 +102,7 @@ GEM listen (3.0.4) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - loofah (2.2.1) + loofah (2.2.2) crass (~> 1.0.2) nokogiri (>= 1.5.9) method_source (0.8.2) @@ -143,17 +143,17 @@ GEM sprockets-sass (~> 1.3.0) mime-types (2.6.2) mini_portile2 (2.3.0) - minitest (5.10.2) - multi_json (1.11.2) + minitest (5.11.3) + multi_json (1.13.1) multipart-post (2.0.0) neat (1.8.0) sass (>= 3.3) thor (~> 0.19) - nokogiri (1.8.2) + nokogiri (1.8.4) mini_portile2 (~> 2.3.0) - nokogiri (1.8.2-x64-mingw32) + nokogiri (1.8.4-x64-mingw32) mini_portile2 (~> 2.3.0) - nokogiri (1.8.2-x86-mingw32) + nokogiri (1.8.4-x86-mingw32) mini_portile2 (~> 2.3.0) padrino-helpers (0.12.5) i18n (~> 0.6, >= 0.6.7) @@ -183,7 +183,7 @@ GEM pry-byebug (1.3.2) byebug (~> 2.7) pry (~> 0.9.12) - rack (1.6.8) + rack (1.6.10) rack-test (0.6.3) rack (>= 1.0) rails-deprecated_sanitizer (1.0.3) @@ -192,14 +192,14 @@ GEM activesupport (>= 4.2.0, < 5.0) nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - railties (4.2.9) - actionpack (= 4.2.9) - activesupport (= 4.2.9) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (4.2.10) + actionpack (= 4.2.10) + activesupport (= 4.2.10) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.0.0) + rake (12.3.1) rb-fsevent (0.9.6) rb-inotify (0.9.5) ffi (>= 0.5.0) @@ -217,7 +217,7 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.4.0) rspec-support (3.4.0) - sass (3.4.19) + sass (3.4.25) sass-rails (5.0.7) railties (>= 4.0.0, < 6) sass (~> 3.1) @@ -225,7 +225,7 @@ GEM sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) slop (3.6.0) - sprockets (2.12.4) + sprockets (2.12.5) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -244,10 +244,10 @@ GEM daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (0.19.1) + thor (0.20.0) thread_safe (0.3.6) tilt (1.4.1) - tzinfo (1.2.3) + tzinfo (1.2.5) thread_safe (~> 0.1) tzinfo-data (1.2017.3) tzinfo (>= 1.0.0) @@ -284,7 +284,7 @@ DEPENDENCIES gmaps4rails highline listen - loofah (= 2.2.1) + loofah (>= 2.2.2) middleman (~> 3.0) middleman-alias! middleman-blog (~> 3.0) @@ -294,6 +294,7 @@ DEPENDENCIES pry pry-byebug rack + rails-html-sanitizer (>= 1.0.4) rake redcarpet rspec