summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorconnorshea <connor.james.shea@gmail.com>2016-04-10 14:21:02 -0600
committerconnorshea <connor.james.shea@gmail.com>2016-04-10 21:57:42 -0600
commita153a1d6fb0aa41de08e07ecfe7e73ccef4dacc2 (patch)
tree2c3787cb27a3e6d2831cbec2d6289da88b96bb00 /Gemfile
parent0631a1e9e2ad281d460b9183609e9fcef0bf4c6b (diff)
downloadgitlab-ce-a153a1d6fb0aa41de08e07ecfe7e73ccef4dacc2.tar.gz
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
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 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'