aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-05-11 19:12:30 -0300
committerSantiago Pastorino <santiago@wyeworks.com>2011-05-11 19:12:41 -0300
commitb89f269957e8e0e587d855dd5db49a2f23bc9e02 (patch)
tree5452bc8a90f7bf933946a25917d6341a04a83d55
parentd192d85668e967547a20cdbd0a0f40a8477b272a (diff)
downloadrails-b89f269957e8e0e587d855dd5db49a2f23bc9e02.tar.gz
rails-b89f269957e8e0e587d855dd5db49a2f23bc9e02.tar.bz2
rails-b89f269957e8e0e587d855dd5db49a2f23bc9e02.zip
Depend on master uglifier for now
-rw-r--r--Gemfile2
-rw-r--r--railties/lib/rails/generators/rails/app/templates/Gemfile4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 23b1a1096b..7199301b90 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,7 +10,7 @@ end
gem "coffee-script"
gem "sass"
-gem "uglifier"
+gem "uglifier", :git => 'git://github.com/lautis/uglifier.git'
gem "rake", ">= 0.8.7"
gem "mocha", ">= 0.9.8"
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile
index a69efdf29d..3af28bb416 100644
--- a/railties/lib/rails/generators/rails/app/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/app/templates/Gemfile
@@ -9,7 +9,7 @@ source 'http://rubygems.org'
<%= "gem 'json'\n" if RUBY_VERSION < "1.9.2" -%>
gem 'sass'
gem 'coffee-script'
-gem 'uglifier'
+gem 'uglifier', :git => 'git://github.com/lautis/uglifier.git'
<%= gem_for_javascript %>
@@ -22,4 +22,4 @@ gem 'uglifier'
# To use debugger
# <%= gem_for_ruby_debugger %>
-<%= gem_for_turn -%> \ No newline at end of file
+<%= gem_for_turn -%>