aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-07-24 06:55:25 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2011-07-24 06:55:25 -0700
commit8a9cacba6d9cdeeda3d31f269ed33ed422fba28d (patch)
treeef394c2c028386c16e73ea528b7d408a7eec200e
parentd33eb07543aed1a07f9efe40ff7edc983b401957 (diff)
parentfe37b48f282c919e4d645b6e264ffad14a5576ce (diff)
downloadrails-8a9cacba6d9cdeeda3d31f269ed33ed422fba28d.tar.gz
rails-8a9cacba6d9cdeeda3d31f269ed33ed422fba28d.tar.bz2
rails-8a9cacba6d9cdeeda3d31f269ed33ed422fba28d.zip
Merge pull request #2239 from castlerock/scaffold_jquery
fixing broken test as jquery-rails is included in application.js
-rw-r--r--Gemfile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index 743c2a640d..ec064bbda8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,6 +8,7 @@ else
gem "arel", '~> 2.1.3'
end
+gem "jquery-rails"
# This needs to be with require false to avoid
# it being automatically loaded by sprockets
gem "uglifier", ">= 1.0.0", :require => false