diff options
author | Phil Hughes <me@iamphill.com> | 2017-11-27 09:07:14 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-11-27 09:07:14 +0000 |
commit | 03b891c5791f17bbe426a47f53e0f46704543182 (patch) | |
tree | 5e5232127d182d020bd9c982b63d869a4d2f174c /package.json | |
parent | 5d8906766068a230f96c6fc5df182553edff69e1 (diff) | |
parent | b95445ba8657fd154d3bba6a2877c1f2f165845c (diff) | |
download | gitlab-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 'package.json')
-rw-r--r-- | package.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package.json b/package.json index b7d3935612b..8c1b2c401ed 100644 --- a/package.json +++ b/package.json @@ -42,8 +42,8 @@ "fuzzaldrin-plus": "^0.5.0", "imports-loader": "^0.7.1", "jed": "^1.1.1", - "jquery": "^2.2.1", - "jquery-ujs": "^1.2.1", + "jquery": "^2.2.4", + "jquery-ujs": "1.2.2", "js-cookie": "^2.1.3", "jszip": "^3.1.3", "jszip-utils": "^0.0.2", |