summaryrefslogtreecommitdiff
path: root/yarn.lock
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 /yarn.lock
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 'yarn.lock')
-rw-r--r--yarn.lock12
1 files changed, 6 insertions, 6 deletions
diff --git a/yarn.lock b/yarn.lock
index 2453da6ce4f..73cc4f11500 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3584,15 +3584,15 @@ jed@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/jed/-/jed-1.1.1.tgz#7a549bbd9ffe1585b0cd0a191e203055bee574b4"
-jquery-ujs@^1.2.1:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/jquery-ujs/-/jquery-ujs-1.2.1.tgz#6ee75b1ef4e9ac95e7124f8d71f7d351f5548e92"
+jquery-ujs@1.2.2:
+ version "1.2.2"
+ resolved "https://registry.yarnpkg.com/jquery-ujs/-/jquery-ujs-1.2.2.tgz#6a8ef1020e6b6dda385b90a4bddc128c21c56397"
dependencies:
jquery ">=1.8.0"
-"jquery@>= 1.9.1", jquery@>=1.8.0, jquery@^2.2.1:
- version "2.2.1"
- resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.2.1.tgz#3c3e16854ad3d2ac44ac65021b17426d22ad803f"
+"jquery@>= 1.9.1", jquery@>=1.8.0, jquery@^2.2.4:
+ version "2.2.4"
+ resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.2.4.tgz#2c89d6889b5eac522a7eea32c14521559c6cbf02"
js-base64@^2.1.9:
version "2.1.9"