From 598aff69292c7005f94c008f3089249f9901e046 Mon Sep 17 00:00:00 2001
From: Josh Black <raskchanky@gmail.com>
Date: Thu, 10 Sep 2015 10:10:51 -0700
Subject: [PATCH] upgrade jquery-rails to patch CVE-2015-1840

ChangeLog-Entry: Upgrade jquery-rails to patch CVE-2015-1840
---
 src/oc-id/Gemfile      |  2 +-
 src/oc-id/Gemfile.lock | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/oc-id/Gemfile b/src/oc-id/Gemfile
index 7356bf8b1b..dee0717dfc 100644
--- a/src/oc-id/Gemfile
+++ b/src/oc-id/Gemfile
@@ -4,7 +4,7 @@ gem 'rails'
 gem 'chef', '~> 11.10.4'
 gem 'coffee-rails', '~> 4.0.0'
 gem 'jbuilder', '~> 1.2'
-gem 'jquery-rails', '~> 3.1.0'
+gem 'jquery-rails'
 gem 'jwt' # For Zendesk SSO
 gem 'rails_config', '~> 0.4.2'
 gem 'rb-readline', '~> 0.5.2', require: false
diff --git a/src/oc-id/Gemfile.lock b/src/oc-id/Gemfile.lock
index 1ebfcd7589..36eb1c5a50 100644
--- a/src/oc-id/Gemfile.lock
+++ b/src/oc-id/Gemfile.lock
@@ -180,13 +180,14 @@ GEM
     jbuilder (1.5.3)
       activesupport (>= 3.0.0)
       multi_json (>= 1.2.0)
-    jquery-rails (3.1.2)
-      railties (>= 3.0, < 5.0)
+    jquery-rails (4.0.5)
+      rails-dom-testing (~> 1.0)
+      railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)
     jwt (1.4.1)
     kgio (2.9.3)
-    loofah (2.0.2)
+    loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
@@ -201,7 +202,7 @@ GEM
     method_source (0.8.2)
     mime-types (1.25.1)
     mini_portile (0.6.2)
-    minitest (5.7.0)
+    minitest (5.8.0)
     mixlib-authentication (1.3.0)
       mixlib-log
     mixlib-cli (1.5.0)
@@ -259,7 +260,7 @@ GEM
       rack (~> 1.2)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
-    rack (1.6.1)
+    rack (1.6.4)
     rack-protection (1.5.3)
       rack
     rack-test (0.6.3)
@@ -277,7 +278,7 @@ GEM
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.6)
+    rails-dom-testing (1.0.7)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
@@ -403,7 +404,7 @@ DEPENDENCIES
   factory_girl_rails (~> 4.4.0)
   jazz_hands!
   jbuilder (~> 1.2)
-  jquery-rails (~> 3.1.0)
+  jquery-rails
   jwt
   mailcatcher
   mixlib-authentication (~> 1.3.0)