From 91ed8ae916293c479158ba732bb37fa4ce8c91b8 Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Thu, 22 Jan 2015 15:39:05 -0500 Subject: [PATCH] Update eventmachine to a version that compiles --- website/Gemfile.lock | 56 ++++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/website/Gemfile.lock b/website/Gemfile.lock index f30c41661..e956a6aa6 100644 --- a/website/Gemfile.lock +++ b/website/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://github.com/hashicorp/middleman-hashicorp.git - revision: b82c2c2fdc244cd0bd529ff27cfab24e43f07708 + revision: 30c15f93fb501041cff97c490b60ddc96c8314c9 specs: middleman-hashicorp (0.1.0) bootstrap-sass (~> 3.2) @@ -20,14 +20,18 @@ GIT GEM remote: https://rubygems.org/ specs: - activesupport (4.1.8) + 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) - bootstrap-sass (3.3.1.0) - sass (~> 3.2) + autoprefixer-rails (5.0.0.2) + execjs + json + bootstrap-sass (3.3.3) + autoprefixer-rails (>= 5.0.0.1) + sass (>= 3.2.19) builder (3.2.2) celluloid (0.16.0) timers (~> 4.0.0) @@ -37,14 +41,14 @@ GEM execjs coffee-script-source (1.8.0) commonjs (0.2.7) - compass (1.0.1) + compass (1.0.3) chunky_png (~> 1.2) - compass-core (~> 1.0.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.1) + compass-core (1.0.3) multi_json (~> 1.0) sass (>= 3.3.0, < 3.5) compass-import-once (1.0.5) @@ -54,10 +58,10 @@ GEM eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) erubis (2.7.0) - eventmachine (1.0.3) + eventmachine (1.0.4) execjs (2.2.2) ffi (1.9.6) - haml (4.0.5) + haml (4.0.6) tilt hike (1.2.3) hitimes (1.2.2) @@ -66,12 +70,12 @@ GEM htmlcompressor (0.1.2) http_parser.rb (0.6.0) i18n (0.6.11) - json (1.8.1) + json (1.8.2) kramdown (1.5.0) less (2.6.0) commonjs (~> 0.2.7) libv8 (3.16.14.7) - listen (2.8.0) + listen (2.8.5) celluloid (>= 0.15.2) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) @@ -98,22 +102,22 @@ GEM rack-test (~> 0.6.2) thor (>= 0.15.2, < 2.0) tilt (~> 1.4.1, < 2.0) - middleman-livereload (3.3.4) + middleman-livereload (3.4.2) em-websocket (~> 0.5.1) - middleman-core (~> 3.2) + middleman-core (>= 3.3) rack-livereload (~> 0.3.15) middleman-minify-html (3.4.0) htmlcompressor (~> 0.1.0) middleman-core (>= 3.2) - middleman-sprockets (3.3.10) - middleman-core (~> 3.3) + middleman-sprockets (3.4.1) + middleman-core (>= 3.3) sprockets (~> 2.12.1) sprockets-helpers (~> 1.1.0) - sprockets-sass (~> 1.2.0) + sprockets-sass (~> 1.3.0) middleman-syntax (2.0.0) middleman-core (~> 3.2) rouge (~> 1.0) - minitest (5.4.3) + minitest (5.5.1) multi_json (1.10.1) padrino-helpers (0.12.4) i18n (~> 0.6, >= 0.6.7) @@ -121,22 +125,22 @@ GEM tilt (~> 1.4.1) padrino-support (0.12.4) activesupport (>= 3.1) - rack (1.5.2) + rack (1.6.0) rack-contrib (1.2.0) rack (>= 0.9.1) rack-livereload (0.3.15) rack - rack-rewrite (1.5.0) + rack-rewrite (1.5.1) rack-ssl-enforcer (0.2.8) - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) rb-fsevent (0.9.4) rb-inotify (0.9.5) ffi (>= 0.5.0) - redcarpet (3.2.0) + redcarpet (3.2.2) ref (1.0.5) - rouge (1.7.3) - sass (3.4.8) + rouge (1.7.7) + sass (3.4.10) sprockets (2.12.3) hike (~> 1.2) multi_json (~> 1.0) @@ -144,7 +148,7 @@ GEM tilt (~> 1.1, != 1.3.0) sprockets-helpers (1.1.0) sprockets (~> 2.0) - sprockets-sass (1.2.0) + sprockets-sass (1.3.1) sprockets (~> 2.0) tilt (~> 1.1) therubyracer (0.12.1) @@ -161,8 +165,8 @@ GEM hitimes tzinfo (1.2.2) thread_safe (~> 0.1) - uber (0.0.11) - uglifier (2.5.3) + uber (0.0.13) + uglifier (2.7.0) execjs (>= 0.3.0) json (>= 1.8.0)