aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-12-18 04:12:50 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-12-18 04:13:53 -0200
commit8f8cb1baa3b5609969805fcdd7295f3d7de2bd6b (patch)
treec207659732ba2439f167476fd13ee9541cc38ad8
parent2750b1b4177db03a0848432e9413a0b3acec38c8 (diff)
downloadrails-8f8cb1baa3b5609969805fcdd7295f3d7de2bd6b.tar.gz
rails-8f8cb1baa3b5609969805fcdd7295f3d7de2bd6b.tar.bz2
rails-8f8cb1baa3b5609969805fcdd7295f3d7de2bd6b.zip
Install jquery-rails
It will make sure that the generated application in the tests get the gem.
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock5
2 files changed, 6 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index 9ab6cddbeb..e4e59241fb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,6 +13,7 @@ gem 'rack', github: 'rack/rack', branch: 'master'
gem 'mocha', '~> 0.14', require: false
gem 'rack-cache', '~> 1.2'
+gem 'jquery-rails'
gem 'coffee-rails', '~> 4.1.0'
gem 'turbolinks'
diff --git a/Gemfile.lock b/Gemfile.lock
index ad75b2c9c6..20a218cf73 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -168,6 +168,10 @@ GEM
hitimes (1.2.3)
hitimes (1.2.3-x86-mingw32)
i18n (0.7.0)
+ jquery-rails (4.0.5)
+ rails-dom-testing (~> 1.0)
+ railties (>= 4.2.0)
+ thor (>= 0.14, < 2.0)
json (1.8.3)
kindlerb (0.1.1)
mustache
@@ -311,6 +315,7 @@ DEPENDENCIES
dalli (>= 2.2.1)
delayed_job
delayed_job_active_record
+ jquery-rails
json
kindlerb (= 0.1.1)
listen (~> 3.0.5)