diff --git a/Gemfile.lock b/Gemfile.lock index ec39366320..8a47340468 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,84 +9,109 @@ GIT GEM remote: https://rubygems.org/ specs: - activesupport (3.2.16) - i18n (~> 0.6, >= 0.6.4) - multi_json (~> 1.0) + activesupport (4.1.9) + i18n (~> 0.6, >= 0.6.9) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.1) + tzinfo (~> 1.1) addressable (2.3.6) builder (3.2.2) - chunky_png (1.2.9) - coffee-script (2.2.0) + celluloid (0.16.0) + timers (~> 4.0.0) + chunky_png (1.3.4) + coffee-script (2.3.0) coffee-script-source execjs - coffee-script-source (1.6.3) - compass (0.12.2) + coffee-script-source (1.9.1) + compass (1.0.3) chunky_png (~> 1.2) - fssm (>= 0.2.7) - sass (~> 3.1) + compass-core (~> 1.0.2) + compass-import-once (~> 1.0.5) + rb-fsevent (>= 0.9.3) + rb-inotify (>= 0.9) + sass (>= 3.3.13, < 3.5) + compass-core (1.0.3) + multi_json (~> 1.0) + sass (>= 3.3.0, < 3.5) + compass-import-once (1.0.5) + sass (>= 3.2, < 3.5) em-websocket (0.5.0) eventmachine (>= 0.12.9) http_parser.rb (~> 0.5.3) - eventmachine (1.0.3) - execjs (1.4.0) - multi_json (~> 1.0) - ffi (1.9.3) - fssm (0.2.10) - haml (4.0.5) + erubis (2.7.0) + eventmachine (1.0.7) + execjs (2.3.0) + ffi (1.9.6) + haml (4.0.6) tilt hike (1.2.3) + hitimes (1.2.2) + hooks (0.4.0) + uber (~> 0.0.4) hpricot (0.8.6) http_parser.rb (0.5.3) - i18n (0.6.9) - kramdown (1.3.1) - listen (1.3.1) + i18n (0.7.0) + json (1.8.2) + kramdown (1.5.0) + listen (2.8.5) + celluloid (>= 0.15.2) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - rb-kqueue (>= 0.2) - middleman (3.2.1) - coffee-script (~> 2.2.0) - compass (>= 0.12.2) - execjs (~> 1.4.0) - haml (>= 3.1.6) + middleman (3.3.9) + coffee-script (~> 2.2) + compass (>= 1.0.0, < 2.0.0) + compass-import-once (= 1.0.5) + execjs (~> 2.0) + haml (>= 4.0.5) kramdown (~> 1.2) - middleman-core (= 3.2.1) + middleman-core (= 3.3.9) middleman-sprockets (>= 3.1.2) - sass (>= 3.1.20) - uglifier (~> 2.1.0) + sass (>= 3.4.0, < 4.0) + uglifier (~> 2.5) middleman-blog (3.5.3) addressable (~> 2.3.5) middleman-core (~> 3.2) tzinfo (>= 0.3.0) - middleman-core (3.2.1) - activesupport (~> 3.2.6) + middleman-core (3.3.9) + activesupport (~> 4.1.0) bundler (~> 1.1) - i18n (~> 0.6.1) - listen (~> 1.1) - rack (>= 1.4.5) - rack-test (~> 0.6.1) + erubis + hooks (~> 0.3) + i18n (~> 0.7.0) + listen (>= 2.7.9, < 3.0) + padrino-helpers (~> 0.12.3) + rack (>= 1.4.5, < 2.0) + rack-test (~> 0.6.2) thor (>= 0.15.2, < 2.0) - tilt (~> 1.4.1) + tilt (~> 1.4.1, < 2.0) middleman-livereload (3.1.0) em-websocket (>= 0.2.0) middleman-core (>= 3.0.2) multi_json (~> 1.0) rack-livereload - middleman-sprockets (3.2.0) - middleman-core (~> 3.2) - sprockets (~> 2.1) - sprockets-helpers (~> 1.0.0) - sprockets-sass (~> 1.0.0) - multi_json (1.8.4) + middleman-sprockets (3.4.1) + middleman-core (>= 3.3) + sprockets (~> 2.12.1) + sprockets-helpers (~> 1.1.0) + sprockets-sass (~> 1.3.0) + minitest (5.5.1) + multi_json (1.10.1) mustache (0.99.5) - rack (1.5.2) + padrino-helpers (0.12.4) + i18n (~> 0.6, >= 0.6.7) + padrino-support (= 0.12.4) + tilt (~> 1.4.1) + padrino-support (0.12.4) + activesupport (>= 3.1) + rack (1.6.0) rack-livereload (0.3.15) rack - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) rake (10.1.1) rb-fsevent (0.9.4) - rb-inotify (0.9.3) - ffi (>= 0.5.0) - rb-kqueue (0.2.0) + rb-inotify (0.9.5) ffi (>= 0.5.0) rdiscount (2.1.7) ronn (0.7.3) @@ -94,25 +119,28 @@ GEM mustache (>= 0.7.0) rdiscount (>= 1.5.8) rouge (1.3.2) - sass (3.2.13) - sprockets (2.10.1) + sass (3.4.12) + sprockets (2.12.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-helpers (1.0.1) + sprockets-helpers (1.1.0) sprockets (~> 2.0) - sprockets-sass (1.0.2) + sprockets-sass (1.3.1) sprockets (~> 2.0) tilt (~> 1.1) - thor (0.18.1) + thor (0.19.1) thread_safe (0.3.4) tilt (1.4.1) + timers (4.0.1) + hitimes tzinfo (1.2.1) thread_safe (~> 0.1) - uglifier (2.1.2) + uber (0.0.13) + uglifier (2.7.0) execjs (>= 0.3.0) - multi_json (~> 1.0, >= 1.0.2) + json (>= 1.8.0) PLATFORMS ruby