Commit 97f986a1 authored by Frédéric Caplette's avatar Frédéric Caplette

Merge branch 'tz-upgrade-jquery-3-6-0' into 'master'

Upgraded jquery to 3.6.0

See merge request gitlab-org/gitlab!63418
parents 69dc222b f8484a3e
...@@ -114,7 +114,9 @@ import { loadCSSFile } from '../lib/utils/css_utils'; ...@@ -114,7 +114,9 @@ import { loadCSSFile } from '../lib/utils/css_utils';
} }
onModalHide() { onModalHide() {
return this.modalCropImg.attr('src', '').cropper('destroy'); this.modalCropImg.attr('src', '').cropper('destroy');
const modalElement = document.querySelector('.modal-profile-crop');
if (modalElement) modalElement.remove();
} }
onUploadImageBtnClick(e) { onUploadImageBtnClick(e) {
......
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
"immer": "^7.0.7", "immer": "^7.0.7",
"ipaddr.js": "^1.9.1", "ipaddr.js": "^1.9.1",
"jed": "^1.1.1", "jed": "^1.1.1",
"jquery": "^3.5.0", "jquery": "^3.6.0",
"jquery.caret": "^0.3.1", "jquery.caret": "^0.3.1",
"jquery.waitforimages": "^2.2.0", "jquery.waitforimages": "^2.2.0",
"js-cookie": "^2.2.1", "js-cookie": "^2.2.1",
......
...@@ -7336,10 +7336,10 @@ jquery.waitforimages@^2.2.0: ...@@ -7336,10 +7336,10 @@ jquery.waitforimages@^2.2.0:
resolved "https://registry.yarnpkg.com/jquery.waitforimages/-/jquery.waitforimages-2.2.0.tgz#63f23131055a1b060dc913e6d874bcc9b9e6b16b" resolved "https://registry.yarnpkg.com/jquery.waitforimages/-/jquery.waitforimages-2.2.0.tgz#63f23131055a1b060dc913e6d874bcc9b9e6b16b"
integrity sha1-Y/IxMQVaGwYNyRPm2HS8ybnmsWs= integrity sha1-Y/IxMQVaGwYNyRPm2HS8ybnmsWs=
"jquery@>= 1.9.1", jquery@^3.5.0: "jquery@>= 1.9.1", jquery@^3.6.0:
version "3.5.1" version "3.6.0"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg== integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
js-beautify@^1.6.12, js-beautify@^1.8.8: js-beautify@^1.6.12, js-beautify@^1.8.8:
version "1.11.0" version "1.11.0"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment