diff options
| author | Mike Greiling <mike@pixelcog.com> | 2019-06-24 16:46:29 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2019-06-24 16:46:29 +0000 |
| commit | e5d8d15da0c3cf68fa9357b856a6b8a9877770b8 (patch) | |
| tree | 39ee149a6bdb9402b38a24a27d8d22f4cc0158e2 | |
| parent | c64e5848aef996ff48cc3ccdbcab58d446f51f6d (diff) | |
| parent | f8b28ac029409c7146b76dd24487d572501634ce (diff) | |
| download | gitlab-ce-e5d8d15da0c3cf68fa9357b856a6b8a9877770b8.tar.gz | |
Merge branch 'leipert-upgrade-jquery' into 'master'
Upgrade jquery to 3.4.1
See merge request gitlab-org/gitlab-ce!29980
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | yarn.lock | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/package.json b/package.json index 54998cc81dd..8e97419bfcb 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "imports-loader": "^0.8.0", "jed": "^1.1.1", "jest-transform-graphql": "^2.1.0", - "jquery": "^3.2.1", + "jquery": "^3.4.1", "jquery-ujs": "1.2.2", "jquery.caret": "^0.3.1", "jquery.waitforimages": "^2.2.0", diff --git a/yarn.lock b/yarn.lock index 7bbb8ef0f87..c54e7cd460b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6566,10 +6566,10 @@ jquery.waitforimages@^2.2.0: resolved "https://registry.yarnpkg.com/jquery.waitforimages/-/jquery.waitforimages-2.2.0.tgz#63f23131055a1b060dc913e6d874bcc9b9e6b16b" integrity sha1-Y/IxMQVaGwYNyRPm2HS8ybnmsWs= -"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" - integrity sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg== +"jquery@>= 1.9.1", jquery@>=1.8.0, jquery@^3.4.1: + version "3.4.1" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2" + integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw== js-base64@^2.1.8: version "2.5.1" |