From 10f7461bc092d1ae0660b3bf9d2b371a0db9e68d Mon Sep 17 00:00:00 2001
From: Louise Crow <louise.crow@gmail.com>
Date: Wed, 17 Jun 2015 10:21:41 +0100
Subject: Update jquery-rails to get the fix for CVE-2015-1840.

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

diff --git a/Gemfile b/Gemfile
index 3bcab2a9a..5a614a6e0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem 'exception_notification', '~> 3.0.1'
 gem 'fancybox-rails', '~> 0.2.1'
 gem 'foundation-rails', '~> 5.2.1.0'
 gem 'icalendar', '1.4.3'
-gem 'jquery-rails', '~> 3.0.4'
+gem 'jquery-rails', '~> 3.1.3'
 gem 'jquery-ui-rails', '~> 4.1.0'
 gem 'json', '~> 1.8.1'
 gem 'holidays', '~> 1.2.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 24402bca6..f0f195351 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -135,7 +135,7 @@ GEM
     icalendar (1.4.3)
     iso_country_codes (0.6.1)
     journey (1.0.4)
-    jquery-rails (3.0.4)
+    jquery-rails (3.1.3)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (4.1.0)
@@ -328,7 +328,7 @@ DEPENDENCIES
   holidays (~> 1.2.0)
   icalendar (= 1.4.3)
   iso_country_codes (~> 0.6.1)
-  jquery-rails (~> 3.0.4)
+  jquery-rails (~> 3.1.3)
   jquery-ui-rails (~> 4.1.0)
   json (~> 1.8.1)
   locale (~> 2.0.8)
-- 
cgit v1.2.3