upgrade gems: sprockets, nokogiri (Vulnerabilities in libxml2), ...etc
did
committed Dec 21, 2015
commit ace09d4163b0fb537b42e14007dc9965a1fb7057
Showing 4
changed files with
38 additions
and 40 deletions
Gemfile
+0
-1
| @@ | @@ -9,7 +9,6 @@ group :development do |
| # gem 'locomotivecms-liquid', path: '/Users/didier/Documents/LocomotiveCMS/gems/liquid' | |
| # gem 'thin' | |
| gem 'puma' | |
| - | # gem 'sprockets-sass', '~> 1.2.0' |
| gem 'yui-compressor', '~> 0.12.0' | |
| gem 'rack-mini-profiler' | |
Gemfile.lock
+26
-28
| @@ | @@ -9,23 +9,24 @@ PATH |
| dragonfly (~> 1.0.12) | |
| haml (~> 4.0.6) | |
| httparty (~> 0.13.6) | |
| - | kramdown (~> 1.8.0) |
| + | kramdown (~> 1.9.0) |
| + | less (~> 2.6.0) |
| locomotivecms-solid (~> 4.0.1) | |
| locomotivecms_common (~> 0.0.5) | |
| mime-types (~> 2.6.1) | |
| mimetype-fu (~> 0.1.2) | |
| moneta (~> 0.8.0) | |
| - | mongo (~> 2.1.2) |
| + | mongo (~> 2.2.1) |
| morphine (~> 0.1.1) | |
| - | nokogiri (~> 1.6.6.4) |
| + | nokogiri (~> 1.6.7.1) |
| origin (~> 2.1.1) | |
| rack-cache (~> 1.2) | |
| rack-rewrite (~> 1.5.1) | |
| rack_csrf (~> 2.5.0) | |
| - | sanitize (~> 4.0.0) |
| - | sprockets (~> 2.12.3) |
| - | sprockets-less (~> 0.6.1) |
| - | sprockets-sass (~> 1.3.1) |
| + | sanitize (~> 4.0.1) |
| + | sass (~> 3.4.20) |
| + | sprockets (~> 3.5.2) |
| + | therubyracer (~> 0.12.2) |
| GEM | |
| remote: https://rubygems.org/ | |
| @@ | @@ -39,7 +40,7 @@ GEM |
| tzinfo (~> 1.1) | |
| addressable (2.4.0) | |
| attr_extras (4.4.0) | |
| - | bson (3.2.6) |
| + | bson (4.0.0) |
| byebug (4.0.5) | |
| columnize (= 0.9.0) | |
| chronic (0.10.2) | |
| @@ | @@ -66,6 +67,7 @@ GEM |
| sass (>= 3.3.0, < 3.5) | |
| compass-import-once (1.0.5) | |
| sass (>= 3.2, < 3.5) | |
| + | concurrent-ruby (1.0.0) |
| coveralls (0.8.10) | |
| json (~> 1.8) | |
| rest-client (>= 1.6.8, < 2) | |
| @@ | @@ -91,7 +93,6 @@ GEM |
| fast_stack | |
| haml (4.0.7) | |
| tilt | |
| - | hike (1.2.3) |
| http-cookie (1.0.2) | |
| domain_name (~> 0.5) | |
| httparty (0.13.7) | |
| @@ | @@ -106,9 +107,10 @@ GEM |
| json_spec (1.1.4) | |
| multi_json (~> 1.0) | |
| rspec (>= 2.0, < 4.0) | |
| - | kramdown (1.8.0) |
| + | kramdown (1.9.0) |
| less (2.6.0) | |
| commonjs (~> 0.2.7) | |
| + | libv8 (3.16.14.13) |
| locomotivecms-liquid (4.0.0) | |
| locomotivecms-solid (4.0.1) | |
| locomotivecms-liquid (~> 4.0.0) | |
| @@ | @@ -121,18 +123,18 @@ GEM |
| method_source (0.8.2) | |
| mime-types (2.6.2) | |
| mimetype-fu (0.1.2) | |
| - | mini_portile (0.6.2) |
| + | mini_portile2 (2.0.0) |
| minitest (5.8.3) | |
| moneta (0.8.0) | |
| - | mongo (2.1.2) |
| - | bson (~> 3.0) |
| + | mongo (2.2.1) |
| + | bson (~> 4.0) |
| morphine (0.1.1) | |
| multi_json (1.11.2) | |
| multi_xml (0.5.5) | |
| netrc (0.11.0) | |
| - | nokogiri (1.6.6.4) |
| - | mini_portile (~> 0.6.0) |
| - | nokogumbo (1.4.6) |
| + | nokogiri (1.6.7.1) |
| + | mini_portile2 (~> 2.0.0.rc2) |
| + | nokogumbo (1.4.7) |
| nokogiri | |
| origin (2.1.1) | |
| pry (0.10.3) | |
| @@ | @@ -159,6 +161,7 @@ GEM |
| rb-fsevent (0.9.6) | |
| rb-inotify (0.9.5) | |
| ffi (>= 0.5.0) | |
| + | ref (2.0.0) |
| rest-client (1.8.0) | |
| http-cookie (>= 1.0.2, < 2.0) | |
| mime-types (>= 1.16, < 3.0) | |
| @@ | @@ -187,24 +190,19 @@ GEM |
| simplecov-html (~> 0.10.0) | |
| simplecov-html (0.10.0) | |
| slop (3.6.0) | |
| - | sprockets (2.12.4) |
| - | hike (~> 1.2) |
| - | multi_json (~> 1.0) |
| - | rack (~> 1.0) |
| - | tilt (~> 1.1, != 1.3.0) |
| - | sprockets-less (0.6.1) |
| - | less (~> 2.4) |
| - | tilt (~> 1.1) |
| - | sprockets-sass (1.3.1) |
| - | sprockets (~> 2.0) |
| - | tilt (~> 1.1) |
| + | sprockets (3.5.2) |
| + | concurrent-ruby (~> 1.0) |
| + | rack (> 1, < 3) |
| stackprof (0.2.7) | |
| stringex (2.5.2) | |
| term-ansicolor (1.3.2) | |
| tins (~> 1.0) | |
| + | therubyracer (0.12.2) |
| + | libv8 (~> 3.16.14.0) |
| + | ref |
| thor (0.19.1) | |
| thread_safe (0.3.5) | |
| - | tilt (1.4.1) |
| + | tilt (2.0.1) |
| timecop (0.7.4) | |
| tins (1.6.0) | |
| tzinfo (1.2.2) | |
locomotive/steam/initializers/sprockets.rb b/lib/locomotive/steam/initializers/sprockets.rb
+4
-4
| @@ | @@ -1,11 +1,9 @@ |
| require 'sprockets' | |
| - | require 'sprockets-sass' |
| - | require 'sprockets-less' |
| + | require 'sass' |
| + | require 'less' |
| require 'coffee_script' | |
| require 'compass' | |
| - | Sprockets::Sass.add_sass_functions = false |
| - | |
| module Locomotive::Steam | |
| class SprocketsEnvironment < ::Sprockets::Environment | |
| @@ | @@ -26,6 +24,8 @@ module Locomotive::Steam |
| %w(fonts stylesheets javascripts).each do |name| | |
| append_path File.join(@steam_path, name) | |
| end | |
| + | |
| + | Compass::Frameworks::ALL.each { |f| append_path(f.stylesheets_directory) } |
| end | |
| def install_yui_compressor(options) | |
locomotivecms_steam.gemspec
+8
-7
| @@ | @@ -18,11 +18,11 @@ Gem::Specification.new do |spec| |
| spec.add_development_dependency 'bundler', '~> 1.7' | |
| spec.add_development_dependency 'rake', '~> 10.4.2' | |
| - | spec.add_dependency 'mongo', '~> 2.1.2' |
| + | spec.add_dependency 'mongo', '~> 2.2.1' |
| spec.add_dependency 'origin', '~> 2.1.1' | |
| - | spec.add_dependency 'nokogiri', '~> 1.6.6.4' |
| - | spec.add_dependency 'sanitize', '~> 4.0.0' |
| + | spec.add_dependency 'nokogiri', '~> 1.6.7.1' |
| + | spec.add_dependency 'sanitize', '~> 4.0.1' |
| spec.add_dependency 'morphine', '~> 0.1.1' | |
| spec.add_dependency 'httparty', '~> 0.13.6' | |
| spec.add_dependency 'chronic', '~> 0.10.2' | |
| @@ | @@ -33,13 +33,14 @@ Gem::Specification.new do |spec| |
| spec.add_dependency 'moneta', '~> 0.8.0' | |
| spec.add_dependency 'rack_csrf', '~> 2.5.0' | |
| - | spec.add_dependency 'sprockets', '~> 2.12.3' |
| - | spec.add_dependency 'sprockets-sass', '~> 1.3.1' |
| - | spec.add_dependency 'sprockets-less', '~> 0.6.1' |
| + | spec.add_dependency 'sprockets', '~> 3.5.2' |
| + | spec.add_dependency 'sass', '~> 3.4.20' |
| + | spec.add_dependency 'less', '~> 2.6.0' |
| + | spec.add_dependency 'therubyracer', '~> 0.12.2' |
| spec.add_dependency 'coffee-script', '~> 2.4.1' | |
| spec.add_dependency 'compass', '~> 1.0.3' | |
| - | spec.add_dependency 'kramdown', '~> 1.8.0' |
| + | spec.add_dependency 'kramdown', '~> 1.9.0' |
| spec.add_dependency 'RedCloth', '~> 4.2.9' | |
| spec.add_dependency 'haml', '~> 4.0.6' | |
| spec.add_dependency 'mimetype-fu', '~> 0.1.2' | |