From: Tom Hughes <tom@compton.nu>
Date: Thu, 3 Jan 2013 11:10:32 +0000 (+0000)
Subject: Stick with therubyracer 0.10.x for now
X-Git-Tag: live~5178
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/6bd16d543a19576dbe783240867b87a5cf844946?hp=71255ea666faa8d27cc4edd791e84bc75bcbcb06

Stick with therubyracer 0.10.x for now

The 0.11.x release is a complete mess, as amply documented in the github
issue tracker (https://github.com/cowboyd/therubyracer/issues/215).
---

diff --git a/Gemfile b/Gemfile
index f16f44a3a..5d4f66989 100644
--- a/Gemfile
+++ b/Gemfile
@@ -66,6 +66,6 @@ group :assets do
   gem 'sass-rails', '~> 3.2.3'
   gem 'coffee-rails', '~> 3.2.1'
   gem 'uglifier', '>= 1.0.3'
-  gem 'therubyracer'
+  gem 'therubyracer', '~> 0.10.2'
   gem 'ejs'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 9480857ac..993056846 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -66,6 +66,7 @@ GEM
     json (1.7.6)
     jwt (0.1.5)
       multi_json (>= 1.0)
+    libv8 (3.3.10.4)
     libxml-ruby (2.4.0)
     mail (2.4.4)
       i18n (>= 0.4.0)
@@ -132,7 +133,6 @@ GEM
     rdoc (3.12)
       json (~> 1.4)
     redcarpet (2.2.2)
-    ref (1.0.2)
     rinku (1.7.2)
     ruby-openid (2.2.2)
     sanitize (2.0.3)
@@ -147,8 +147,8 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    therubyracer (0.11.0)
-      ref
+    therubyracer (0.10.2)
+      libv8 (~> 3.3.10)
     thor (0.16.0)
     tilt (1.3.3)
     timecop (0.5.7)
@@ -194,7 +194,7 @@ DEPENDENCIES
   ruby-openid (>= 2.2.0)
   sanitize
   sass-rails (~> 3.2.3)
-  therubyracer
+  therubyracer (~> 0.10.2)
   timecop
   uglifier (>= 1.0.3)
   validates_email_format_of (>= 1.5.1)