diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-11-04 10:55:01 +0100 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-01-22 14:36:32 +0100 |
| commit | 88992685ba32d1f77d2e29e4d02ef1b5dc1d77b8 (patch) | |
| tree | 915814bf60f6fe937a07c56e1c97f8b5f96ec034 | |
| parent | d6e63f9848adc19ed0d16ce191cbbe811923de9a (diff) | |
| download | gitlab-ce-tz-upgrade-jquery-another-round.tar.gz | |
Upgrade Jquerytz-upgrade-jquery-another-round
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | yarn.lock | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/package.json b/package.json index b3dedf126c5..53210ef44ac 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "fuzzaldrin-plus": "^0.5.0", "imports-loader": "^0.7.1", "jed": "^1.1.1", - "jquery": "^2.2.4", + "jquery": "^3.2.1", "jquery-ujs": "1.2.2", "js-cookie": "^2.1.3", "jszip": "^3.1.3", diff --git a/yarn.lock b/yarn.lock index 81add9b7247..5ad9833488d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4203,9 +4203,13 @@ jquery-ujs@1.2.2: dependencies: jquery ">=1.8.0" -"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: + version "2.2.1" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.2.1.tgz#3c3e16854ad3d2ac44ac65021b17426d22ad803f" + +jquery@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.2.1.tgz#5c4d9de652af6cd0a770154a631bba12b015c787" js-base64@^2.1.9: version "2.1.9" |