aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2015-06-17 10:21:41 +0100
committerLouise Crow <louise.crow@gmail.com>2015-06-17 10:21:41 +0100
commit10f7461bc092d1ae0660b3bf9d2b371a0db9e68d (patch)
tree08b3e32cbc4f1bc925950dc8d742a56fbc821ed3
parentfd37107ea21777514550152bb87a1bb42bb6bdb3 (diff)
Update jquery-rails to get the fix for CVE-2015-1840.
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
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)