From a733ee6a12e7a4ff358457564cec77029cab59eb Mon Sep 17 00:00:00 2001
From: Lars Henrik Mai <lars.mai@kontinui.de>
Date: Tue, 8 Apr 2014 13:34:43 +0200
Subject: upgraded middleman to 3.3.2

---
 Gemfile      |  8 +++----
 Gemfile.lock | 76 ++++++++++++++++++++++++++++++++++++++----------------------
 2 files changed, 52 insertions(+), 32 deletions(-)

diff --git a/Gemfile b/Gemfile
index db7c964..d0922e4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,11 +1,11 @@
 # If you have OpenSSL installed, we recommend updating
 # the following line to use "https"
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
-gem "middleman", "~>3.2.2"
+gem "middleman", "~>3.3.2"
 
 # Live-reloading plugin
-gem "middleman-livereload", "~> 3.1.0"
+gem "middleman-livereload", "~> 3.3.2"
 
 # For faster file watcher updates on Windows:
-gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw]
\ No newline at end of file
+gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw]
diff --git a/Gemfile.lock b/Gemfile.lock
index 3a02cd2..1b65c92 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,29 +1,36 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    activesupport (3.2.17)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
+    activesupport (4.0.4)
+      i18n (~> 0.6, >= 0.6.9)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
     chunky_png (1.3.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
     coffee-script-source (1.7.0)
-    compass (0.12.4)
+    compass (0.12.5)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
-      sass (~> 3.2.17)
+      sass (~> 3.2.19)
+    compass-import-once (1.0.4)
+      sass (>= 3.2, < 3.5)
     em-websocket (0.5.0)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.5.3)
+    erubis (2.7.0)
     eventmachine (1.0.3)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
+    execjs (2.0.2)
     ffi (1.9.3)
     fssm (0.2.10)
     haml (4.0.5)
       tilt
     hike (1.2.3)
+    hooks (0.4.0)
+      uber (~> 0.0.4)
     http_parser.rb (0.5.3)
     i18n (0.6.9)
     json (1.8.1)
@@ -32,36 +39,46 @@ GEM
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
-    middleman (3.2.2)
+    middleman (3.3.2)
       coffee-script (~> 2.2.0)
-      compass (>= 0.12.2)
-      execjs (~> 1.4.0)
-      haml (>= 3.1.6)
+      compass (>= 0.12.4)
+      compass-import-once (~> 1.0.4)
+      execjs (~> 2.0)
+      haml (>= 4.0.5)
       kramdown (~> 1.2)
-      middleman-core (= 3.2.2)
+      middleman-core (= 3.3.2)
       middleman-sprockets (>= 3.1.2)
-      sass (>= 3.1.20)
-      uglifier (~> 2.4.0)
-    middleman-core (3.2.2)
-      activesupport (~> 3.2.6)
+      sass (>= 3.2.17, < 4.0)
+      uglifier (~> 2.5)
+    middleman-core (3.3.2)
+      activesupport (~> 4.0.1)
       bundler (~> 1.1)
+      erubis
+      hooks (~> 0.3)
       i18n (~> 0.6.9)
       listen (~> 1.1)
-      rack (>= 1.4.5)
-      rack-test (~> 0.6.1)
+      padrino-helpers (~> 0.12.1)
+      rack (>= 1.4.5, < 2.0)
+      rack-test (~> 0.6.2)
       thor (>= 0.15.2, < 2.0)
-      tilt (~> 1.4.1)
-    middleman-livereload (3.1.1)
-      em-websocket (>= 0.2.0)
-      middleman-core (>= 3.0.2)
-      multi_json (~> 1.0)
-      rack-livereload
+      tilt (~> 1.4.1, < 2.0)
+    middleman-livereload (3.3.2)
+      em-websocket (~> 0.5.0)
+      middleman-core (~> 3.2)
+      rack-livereload (~> 0.3.15)
     middleman-sprockets (3.3.2)
       middleman-core (>= 3.2)
       sprockets (~> 2.2)
       sprockets-helpers (~> 1.1.0)
       sprockets-sass (~> 1.0.0)
+    minitest (4.7.5)
     multi_json (1.9.2)
+    padrino-helpers (0.12.1)
+      i18n (~> 0.6, >= 0.6.7)
+      padrino-support (= 0.12.1)
+      tilt (~> 1.4.1)
+    padrino-support (0.12.1)
+      activesupport (>= 3.1)
     rack (1.5.2)
     rack-livereload (0.3.15)
       rack
@@ -84,8 +101,11 @@ GEM
       sprockets (~> 2.0)
       tilt (~> 1.1)
     thor (0.19.1)
+    thread_safe (0.3.3)
     tilt (1.4.1)
-    uglifier (2.4.0)
+    tzinfo (0.3.39)
+    uber (0.0.4)
+    uglifier (2.5.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
 
@@ -93,6 +113,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  middleman (~> 3.2.2)
-  middleman-livereload (~> 3.1.0)
+  middleman (~> 3.3.2)
+  middleman-livereload (~> 3.3.2)
   wdm (~> 0.1.0)
-- 
cgit v1.2.1