From 09f9ed3609e3f5c95348b8c396d692b48f624cad Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 2 Aug 2013 10:07:57 +1000 Subject: [PATCH] nuking turbo sprockets, having lots of issues precompiling on jenkins --- Gemfile | 3 ++- Gemfile.lock | 4 ---- Gemfile_rails4.lock | 4 ---- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index f74395d74f6..c726932edf4 100644 --- a/Gemfile +++ b/Gemfile @@ -138,7 +138,8 @@ gem 'discourse_emoji', path: 'vendor/gems/discourse_emoji' group :assets do gem 'sass' gem 'sass-rails' - gem 'turbo-sprockets-rails3' + # Sam: disabling for now, having issues with our jenkins build + # gem 'turbo-sprockets-rails3' gem 'uglifier' end diff --git a/Gemfile.lock b/Gemfile.lock index a0761302cb7..cd2d33da157 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -446,9 +446,6 @@ GEM treetop (1.4.12) polyglot polyglot (>= 0.3.1) - turbo-sprockets-rails3 (0.3.6) - railties (> 3.2.8, < 4.0.0) - sprockets (>= 2.0.0) tzinfo (0.3.37) uglifier (2.0.1) execjs (>= 0.3.0) @@ -550,7 +547,6 @@ DEPENDENCIES therubyracer thin timecop - turbo-sprockets-rails3 uglifier unicorn vestal_versions! diff --git a/Gemfile_rails4.lock b/Gemfile_rails4.lock index 4460eaa932d..a94df124004 100644 --- a/Gemfile_rails4.lock +++ b/Gemfile_rails4.lock @@ -460,9 +460,6 @@ GEM treetop (1.4.14) polyglot polyglot (>= 0.3.1) - turbo-sprockets-rails3 (0.2.9) - railties (>= 3.1.0) - sprockets (>= 2.0.0) tzinfo (0.3.37) uglifier (2.1.2) execjs (>= 0.3.0) @@ -562,7 +559,6 @@ DEPENDENCIES therubyracer thin timecop - turbo-sprockets-rails3 uglifier unicorn vestal_versions!