summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-11-27 09:07:14 +0000
committerPhil Hughes <me@iamphill.com>2017-11-27 09:07:14 +0000
commit03b891c5791f17bbe426a47f53e0f46704543182 (patch)
tree5e5232127d182d020bd9c982b63d869a4d2f174c /Gemfile
parent5d8906766068a230f96c6fc5df182553edff69e1 (diff)
parentb95445ba8657fd154d3bba6a2877c1f2f165845c (diff)
downloadgitlab-ce-03b891c5791f17bbe426a47f53e0f46704543182.tar.gz
Merge branch '40481-bump-jquery-to-2-2-4' into 'master'
Upgrade jQuery to 2.2.4 Closes #40481 See merge request gitlab-org/gitlab-ce!15570
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index a618b1116f5..dd33ca07128 100644
--- a/Gemfile
+++ b/Gemfile
@@ -245,7 +245,7 @@ gem 'font-awesome-rails', '~> 4.7'
gem 'gemojione', '~> 3.3'
gem 'gon', '~> 6.1.0'
gem 'jquery-atwho-rails', '~> 1.3.2'
-gem 'jquery-rails', '~> 4.1.0'
+gem 'jquery-rails', '~> 4.3.1'
gem 'request_store', '~> 1.3'
gem 'select2-rails', '~> 3.5.9'
gem 'virtus', '~> 1.0.1'