From 2313d42b37977afc884a2a2fc7e91180e0acbaf3 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sat, 23 May 2015 00:33:46 -0400
Subject: [PATCH] Bump jquery-rails version

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

diff --git a/Gemfile b/Gemfile
index 94e2129f3c6..0ab0a45cdb5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -195,20 +195,20 @@ gem "uglifier"
 gem 'turbolinks', '~> 2.5.0'
 gem 'jquery-turbolinks'
 
-gem 'select2-rails'
+gem 'addressable'
+gem 'bootstrap-sass',     '~> 3.0'
+gem 'font-awesome-rails', '~> 4.2'
+gem 'gitlab_emoji',       '~> 0.1'
+gem 'gon',                '~> 5.0.0'
 gem 'jquery-atwho-rails', '~> 1.0.0'
-gem "jquery-rails"
-gem "jquery-ui-rails"
-gem "jquery-scrollto-rails"
-gem "raphael-rails", "~> 2.1.2"
-gem 'bootstrap-sass', '~> 3.0'
-gem "font-awesome-rails", '~> 4.2'
-gem "gitlab_emoji", "~> 0.1"
-gem "gon", '~> 5.0.0'
+gem 'jquery-rails',       '3.1.2'
+gem 'jquery-scrollto-rails'
+gem 'jquery-ui-rails'
 gem 'nprogress-rails'
+gem 'raphael-rails',      '~> 2.1.2'
 gem 'request_store'
-gem "virtus"
-gem 'addressable'
+gem 'select2-rails'
+gem 'virtus'
 
 group :development do
   gem 'brakeman', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 80ae41dc8fc..c9b8fc1f554 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -301,7 +301,7 @@ GEM
     ice_cube (0.11.1)
     ice_nine (0.10.0)
     jquery-atwho-rails (1.0.1)
-    jquery-rails (3.1.0)
+    jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     jquery-scrollto-rails (1.4.3)
@@ -746,7 +746,7 @@ DEPENDENCIES
   html-pipeline (~> 1.11.0)
   httparty
   jquery-atwho-rails (~> 1.0.0)
-  jquery-rails
+  jquery-rails (= 3.1.2)
   jquery-scrollto-rails
   jquery-turbolinks
   jquery-ui-rails
-- 
GitLab