From b8755fd0f83f67e4f0b97f2c970a7176efce550d Mon Sep 17 00:00:00 2001
From: Vokhmin Alexey V <avokhmin@gmail.com>
Date: Wed, 17 Jun 2015 21:21:29 +0300
Subject: [PATCH] Update jquery-rails gem

---
 Gemfile      | 2 +-
 Gemfile.lock | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2508f8f9b..132545a8e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -50,7 +50,7 @@ gem 'sprockets'
 gem 'will_paginate'
 gem 'meta-tags', require: 'meta_tags'
 gem 'haml-rails'
-gem 'jquery-rails', '3.1.3'
+gem 'jquery-rails'
 gem 'jquery-migrate-rails'
 gem 'ruby-haml-js'
 gem 'slim'
diff --git a/Gemfile.lock b/Gemfile.lock
index 325f61113..e9c5214fa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -254,8 +254,9 @@ GEM
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
     jquery-migrate-rails (1.2.1)
-    jquery-rails (3.1.3)
-      railties (>= 3.0, < 5.0)
+    jquery-rails (4.0.4)
+      rails-dom-testing (~> 1.0)
+      railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (5.0.5)
       railties (>= 3.2.16)
@@ -691,7 +692,7 @@ DEPENDENCIES
   hirb
   jbuilder
   jquery-migrate-rails
-  jquery-rails (= 3.1.3)
+  jquery-rails
   js-routes
   localeapp
   mailcatcher