From f868ff0bcfe54d02f18ad54b5c202d9fc63f59b1 Mon Sep 17 00:00:00 2001 From: Robert Lord Date: Sun, 22 Jun 2014 03:14:38 -0700 Subject: [PATCH] Revert to old versions of gems, until codeblock-messing up reason is identified --- Gemfile.lock | 63 ++++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 754cebf..f439473 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,13 +1,13 @@ GEM remote: http://rubygems.org/ specs: - activesupport (4.1.1) + activesupport (4.0.4) i18n (~> 0.6, >= 0.6.9) - json (~> 1.7, >= 1.7.7) - minitest (~> 5.1) + minitest (~> 4.2) + multi_json (~> 1.3) thread_safe (~> 0.1) - tzinfo (~> 1.1) - chunky_png (1.3.1) + tzinfo (~> 0.3.37) + chunky_png (1.3.0) coffee-script (2.2.0) coffee-script-source execjs @@ -18,12 +18,12 @@ GEM sass (~> 3.2.19) compass-import-once (1.0.4) sass (>= 3.2, < 3.5) - em-websocket (0.5.1) + em-websocket (0.5.0) eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) + http_parser.rb (~> 0.5.3) erubis (2.7.0) eventmachine (1.0.3) - execjs (2.2.0) + execjs (2.0.2) ffi (1.9.3) fssm (0.2.10) haml (4.0.5) @@ -31,28 +31,28 @@ GEM hike (1.2.3) hooks (0.4.0) uber (~> 0.0.4) - http_parser.rb (0.6.0) + http_parser.rb (0.5.3) i18n (0.6.9) json (1.8.1) - kramdown (1.4.0) + kramdown (1.3.3) libv8 (3.16.14.3) listen (1.3.1) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) rb-kqueue (>= 0.2) - middleman (3.3.3) + middleman (3.3.2) coffee-script (~> 2.2.0) compass (>= 0.12.4) - compass-import-once (= 1.0.4) + compass-import-once (~> 1.0.4) execjs (~> 2.0) haml (>= 4.0.5) kramdown (~> 1.2) - middleman-core (= 3.3.3) + middleman-core (= 3.3.2) middleman-sprockets (>= 3.1.2) sass (>= 3.2.17, < 4.0) uglifier (~> 2.5) - middleman-core (3.3.3) - activesupport (~> 4.1.0) + middleman-core (3.3.2) + activesupport (~> 4.0.1) bundler (~> 1.1) erubis hooks (~> 0.3) @@ -65,8 +65,8 @@ GEM tilt (~> 1.4.1, < 2.0) middleman-gh-pages (0.0.3) rake (> 0.9.3) - middleman-livereload (3.3.4) - em-websocket (~> 0.5.1) + middleman-livereload (3.3.2) + em-websocket (~> 0.5.0) middleman-core (~> 3.2) rack-livereload (~> 0.3.15) middleman-sprockets (3.3.3) @@ -77,28 +77,28 @@ GEM middleman-syntax (2.0.0) middleman-core (~> 3.2) rouge (~> 1.0) - minitest (5.3.5) - multi_json (1.10.1) - padrino-helpers (0.12.2) + minitest (4.7.5) + multi_json (1.9.2) + padrino-helpers (0.12.1) i18n (~> 0.6, >= 0.6.7) - padrino-support (= 0.12.2) + padrino-support (= 0.12.1) tilt (~> 1.4.1) - padrino-support (0.12.2) + padrino-support (0.12.1) activesupport (>= 3.1) rack (1.5.2) rack-livereload (0.3.15) rack rack-test (0.6.2) rack (>= 1.0) - rake (10.3.2) + rake (10.3.1) rb-fsevent (0.9.4) - rb-inotify (0.9.5) + rb-inotify (0.9.3) ffi (>= 0.5.0) - rb-kqueue (0.2.3) + rb-kqueue (0.2.2) ffi (>= 0.5.0) - redcarpet (3.1.2) + redcarpet (3.1.1) ref (1.0.5) - rouge (1.4.0) + rouge (1.3.3) ruby18_source_location (0.2) sass (3.2.19) sprockets (2.12.1) @@ -115,12 +115,11 @@ GEM libv8 (~> 3.16.14.0) ref thor (0.19.1) - thread_safe (0.3.4) + thread_safe (0.3.3) tilt (1.4.1) - tzinfo (1.2.1) - thread_safe (~> 0.1) - uber (0.0.6) - uglifier (2.5.1) + tzinfo (0.3.39) + uber (0.0.4) + uglifier (2.5.0) execjs (>= 0.3.0) json (>= 1.8.0)