From 176bf41efdcaa2655cd2ae40405e2596267fca53 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Tue, 4 Feb 2014 11:13:48 +1100
Subject: [PATCH] therubyracer now ships with my timeout fix, no need for a
 forked gem

---
 Gemfile             | 3 +--
 Gemfile_rails4.lock | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index a89fb1284c..0fc4e00b55 100644
--- a/Gemfile
+++ b/Gemfile
@@ -135,8 +135,7 @@ gem 'sidekiq-failures'
 gem 'sinatra', require: nil
 gem 'slim'  # required for sidekiq-web
 
-# URGENT fix needed see: https://github.com/cowboyd/therubyracer/pull/280
-gem 'therubyracer-discourse', require: 'v8'
+gem 'therubyracer'
 gem 'thin', require: false
 gem 'highline', require: false
 gem 'rack-protection' # security
diff --git a/Gemfile_rails4.lock b/Gemfile_rails4.lock
index 4f8728a363..32c1f95948 100644
--- a/Gemfile_rails4.lock
+++ b/Gemfile_rails4.lock
@@ -368,7 +368,7 @@ GEM
       activesupport (>= 3.0)
       sprockets (~> 2.8)
     temple (0.6.7)
-    therubyracer-discourse (0.12.0)
+    therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
       ref
     thin (1.6.1)
@@ -483,7 +483,7 @@ DEPENDENCIES
   sinatra
   slim
   spork-rails
-  therubyracer-discourse
+  therubyracer
   thin
   timecop
   uglifier