diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2018-02-20 22:20:50 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2018-02-20 22:20:50 +0000 |
commit | 11bf575fe64e55cc932c5629e2d8d103109e0b2b (patch) | |
tree | d7573838c094933a4cb47278ac3c93af2154db69 /yarn.lock | |
parent | 86c9c93de709c9013572682b868b5e6db429dd1e (diff) | |
parent | 35c8fd5586ac4fe9fb192974bcba519bfc1eb964 (diff) | |
download | gitlab-ce-11bf575fe64e55cc932c5629e2d8d103109e0b2b.tar.gz |
Merge branch 'jquery3' into 'master'
Update to jQuery 3.
Closes #33888
See merge request gitlab-org/gitlab-ce!16634
Diffstat (limited to 'yarn.lock')
-rw-r--r-- | yarn.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/yarn.lock b/yarn.lock index 95f20a4d3e1..583fac898d3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4211,9 +4211,9 @@ jquery.waitforimages@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/jquery.waitforimages/-/jquery.waitforimages-2.2.0.tgz#63f23131055a1b060dc913e6d874bcc9b9e6b16b" -"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" +"jquery@>= 1.9.1", jquery@>=1.8.0, jquery@^3.2.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca" js-base64@^2.1.9: version "2.1.9" |