Merge branch 'release/0.4.16'

codebrawl · Nov 27, 2011 · 2638cf5 · 2638cf5
2 parents 68ee62c + 7778d5f
commit 2638cf5
Show file tree

Hide file tree

Showing 16 changed files with 1,387 additions and 428 deletions.
diff --git a/Gemfile b/Gemfile
@@ -57,4 +57,6 @@ group :development, :test do
   gem 'faker'
 
   gem 'rack-webconsole'
+
+  gem 'therubyracer'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -119,6 +119,7 @@ GEM
     launchy (0.4.0)
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
+    libv8 (3.3.10.2)
     mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -258,8 +259,10 @@ GEM
     sprockets (2.0.0)
       hike (~> 1.2)
       rack (~> 1.0)
-      tilt (!= 1.3.0, ~> 1.1)
+      tilt (~> 1.1, != 1.3.0)
     stringex (1.2.1)
+    therubyracer (0.9.8)
+      libv8 (~> 3.3.10)
     thin (1.2.11)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
@@ -315,6 +318,7 @@ DEPENDENCIES
   sass-rails
   shoulda-matchers
   spork (~> 0.9.0.rc)
+  therubyracer
   thin
   timecop
   uglifier