Merge branch 'release-0.1.0' into develop

1 files changed, 27 insertions, 42 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 3f30e62..fe49476 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,44 +1,29 @@
 PATH
   remote: certs
   specs:
-    leap_web_certs (0.0.4)
-      leap_web_core (~> 0.0.1)
-      rails (~> 3.2.8)
+    leap_web_certs (0.1.0)
+      leap_web_core (= 0.1.0)
 
 PATH
   remote: core
   specs:
-    leap_web_core (0.0.1)
+    leap_web_core (0.1.0)
       couchrest (~> 1.1.3)
       couchrest_model (~> 2.0.0.beta2)
+      couchrest_session_store (~> 0.0.1)
+      json
       rails (~> 3.2.8)
 
 PATH
-  remote: help
-  specs:
-    leap_web_help (0.0.1)
-      bootstrap-sass (~> 2.0.4)
-      haml (~> 3.1.7)
-      jquery-rails
-      leap_web_core (~> 0.0.1)
-      rails (~> 3.2.8)
-      simple_form
-
-PATH
   remote: users
   specs:
-    leap_web_users (0.0.1)
-      bootstrap-sass (~> 2.0.4)
-      couchrest_session_store (~> 0.0.1)
-      haml (~> 3.1.7)
-      jquery-rails
-      leap_web_core (~> 0.0.1)
-      rails (~> 3.2.8)
-      ruby-srp (~> 0.1.0)
-      simple_form
+    leap_web_users (0.1.0)
+      leap_web_core (= 0.1.0)
+      ruby-srp (~> 0.1.1)
 
 GEM
   remote: https://rubygems.org/
+  remote: http://rubygems.org/
   specs:
     actionmailer (3.2.8)
       actionpack (= 3.2.8)
@@ -68,8 +53,8 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
-    bootstrap-sass (2.0.4.0)
-    builder (3.0.0)
+    bootstrap-sass (2.0.4.2)
+    builder (3.0.3)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
@@ -94,18 +79,19 @@ GEM
     execjs (1.4.0)
       multi_json (~> 1.0)
     haml (3.1.7)
-    haml-rails (0.3.4)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      haml (~> 3.0)
-      railties (~> 3.0)
+    haml-rails (0.3.5)
+      actionpack (>= 3.1, < 4.1)
+      activesupport (>= 3.1, < 4.1)
+      haml (~> 3.1)
+      railties (>= 3.1, < 4.1)
     hike (1.2.1)
-    i18n (0.6.0)
+    i18n (0.6.1)
     journey (1.0.4)
-    jquery-rails (2.1.1)
+    jquery-rails (2.1.3)
       railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
     json (1.7.5)
+    libv8 (3.3.10.4)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
     mail (2.4.4)
@@ -114,7 +100,7 @@ GEM
       treetop (~> 1.4.8)
     metaclass (0.0.1)
     mime-types (1.19)
-    mocha (0.12.4)
+    mocha (0.12.6)
       metaclass (~> 0.0.1)
     multi_json (1.3.6)
     polyglot (0.3.3)
@@ -123,7 +109,7 @@ GEM
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
     rails (3.2.8)
       actionmailer (= 3.2.8)
@@ -151,19 +137,21 @@ GEM
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    ruby-srp (0.1.0)
+    ruby-srp (0.1.1)
     sass (3.2.1)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    simple_form (2.0.2)
+    simple_form (2.0.4)
       actionpack (~> 3.0)
       activemodel (~> 3.0)
     sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    therubyracer (0.10.2)
+      libv8 (~> 3.3.10)
     thor (0.16.0)
     tilt (1.3.3)
     treetop (1.4.10)
@@ -180,18 +168,15 @@ PLATFORMS
 DEPENDENCIES
   bootstrap-sass (~> 2.0.4)
   coffee-rails (~> 3.2.2)
-  couchrest_session_store
   haml (~> 3.1.7)
   haml-rails (~> 0.3.4)
   jquery-rails
-  json
   leap_web_certs!
   leap_web_core!
-  leap_web_help!
   leap_web_users!
   mocha
-  rails (= 3.2.8)
   ruby-debug
   sass-rails (~> 3.2.5)
   simple_form
-  uglifier (>= 1.2.7)
+  therubyracer
+  uglifier (~> 1.2.7)