From a153a1d6fb0aa41de08e07ecfe7e73ccef4dacc2 Mon Sep 17 00:00:00 2001
From: connorshea <connor.james.shea@gmail.com>
Date: Sun, 10 Apr 2016 14:21:02 -0600
Subject: Upgrade jQuery Rails from 4.0.5 to 4.1.1

Upgrades jQuery to 1.12.1 and jquery-ujs to 1.2.1.

Changelogs:
https://github.com/rails/jquery-rails/blob/master/CHANGELOG.md
https://blog.jquery.com/2016/01/08/jquery-2-2-and-1-12-released/
https://github.com/rails/jquery-ujs/releases
---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 298cfd260ba..d8e35c847b0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -214,7 +214,7 @@ gem 'font-awesome-rails', '~> 4.2'
 gem 'gitlab_emoji',       '~> 0.3.0'
 gem 'gon',                '~> 6.0.1'
 gem 'jquery-atwho-rails', '~> 1.3.2'
-gem 'jquery-rails',       '~> 4.0.0'
+gem 'jquery-rails',       '~> 4.1.0'
 gem 'jquery-scrollto-rails', '~> 1.4.3'
 gem 'jquery-ui-rails',    '~> 5.0.0'
 gem 'raphael-rails',      '~> 2.1.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index 28b71ac7bc8..4c3d7c1f695 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -431,8 +431,8 @@ GEM
       json
     ipaddress (0.8.2)
     jquery-atwho-rails (1.3.2)
-    jquery-rails (4.0.5)
-      rails-dom-testing (~> 1.0)
+    jquery-rails (4.1.1)
+      rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jquery-scrollto-rails (1.4.3)
@@ -951,7 +951,7 @@ DEPENDENCIES
   httparty (~> 0.13.3)
   influxdb (~> 0.2)
   jquery-atwho-rails (~> 1.3.2)
-  jquery-rails (~> 4.0.0)
+  jquery-rails (~> 4.1.0)
   jquery-scrollto-rails (~> 1.4.3)
   jquery-turbolinks (~> 2.1.0)
   jquery-ui-rails (~> 5.0.0)
-- 
cgit v1.2.1