diff options
| author | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-03-02 21:12:02 +0000 |
|---|---|---|
| committer | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-03-02 21:12:02 +0000 |
| commit | 12592ac7f4ae8ee8d074079b37940d5cbd91eb6a (patch) | |
| tree | 2105c174aa35daae4d076e4b1d211657ce1a58d2 | |
| parent | f29429e8c33c15c8d86fc3af7cea071dd83de395 (diff) | |
| parent | 7255baf7e6883580524e5adee23c7cf3ec9e7de9 (diff) | |
| download | gitlab-ce-12592ac7f4ae8ee8d074079b37940d5cbd91eb6a.tar.gz | |
Merge branch 'update-yarn-lock' into 'master'
Update yarn.lock after the removal of jquery-ui
See merge request !9670
| -rw-r--r-- | yarn.lock | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/yarn.lock b/yarn.lock index cb4ef36119f..07224735a58 100644 --- a/yarn.lock +++ b/yarn.lock @@ -25,7 +25,7 @@ acorn-jsx@^3.0.0: dependencies: acorn "^3.0.4" -acorn@4.0.4, acorn@^4.0.3, acorn@^4.0.4: +acorn@4.0.4, acorn@^4.0.4: version "4.0.4" resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.4.tgz#17a8d6a7a6c4ef538b814ec9abac2779293bf30a" @@ -33,7 +33,7 @@ acorn@^3.0.4: version "3.3.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a" -acorn@^4.0.11: +acorn@^4.0.11, acorn@^4.0.3: version "4.0.11" resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.11.tgz#edcda3bd937e7556410d42ed5860f67399c794c0" @@ -2639,10 +2639,6 @@ jodid25519@^1.0.0: dependencies: jsbn "~0.1.0" -"jquery-ui@git+https://github.com/jquery/jquery-ui#1.11.4": - version "1.11.4" - resolved "git+https://github.com/jquery/jquery-ui#d6713024e16de90ea71dc0544ba34e1df01b4d8a" - jquery-ujs@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/jquery-ujs/-/jquery-ujs-1.2.1.tgz#6ee75b1ef4e9ac95e7124f8d71f7d351f5548e92" |