Upgrading jquery-rails since we finished #114

agile-alliance-brazil · Dec 24, 2014 · 806d2e4 · 806d2e4
1 parent 890c8a0
commit 806d2e4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/Gemfile b/Gemfile
@@ -30,7 +30,7 @@ gem 'mysql2', '0.3.17'
 gem 'doorkeeper', '2.0.1'
 gem 'newrelic_rpm', '3.9.8.273'
 
-gem 'jquery-rails', '3.1.2' # 4.0.2 needs rails 4.2.0
+gem 'jquery-rails', '4.0.2'
 gem 'sass-rails', '5.0.0'
 gem 'coffee-rails', '4.1.0'
 gem 'jquery-ui-rails', '5.0.3'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -179,8 +179,9 @@ GEM
     hike (1.2.3)
     hitimes (1.2.2)
     i18n (0.7.0)
-    jquery-rails (3.1.2)
-      railties (>= 3.0, < 5.0)
+    jquery-rails (4.0.2)
+      rails-dom-testing (~> 1.0)
+      railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (5.0.3)
       railties (>= 3.2.16)
@@ -401,7 +402,7 @@ DEPENDENCIES
   guard-konacha!
   guard-rspec
   haml (= 4.0.6)
-  jquery-rails (= 3.1.2)
+  jquery-rails (= 4.0.2)
   jquery-ui-rails (= 5.0.3)
   konacha
   localized_country_select (= 0.9.9)

diff --git a/vendor/cache/jquery-rails-3.1.2.gem b/vendor/cache/jquery-rails-3.1.2.gem
diff --git a/vendor/cache/jquery-rails-4.0.2.gem b/vendor/cache/jquery-rails-4.0.2.gem