diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-07-13 22:58:28 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-07-13 22:58:28 +0000 |
| commit | 632c395e1809715bd3c01e2733a2f8a357136a49 (patch) | |
| tree | 402df1f0fb3cbb01746cfc59c6bf4c0ea4f940e2 /yarn.lock | |
| parent | 1e5369c7a60678ade3a0f39f3429cb2dd0a269fd (diff) | |
| parent | 0ddedab5d59c259d454eee01bdc22832048bd7d4 (diff) | |
| download | gitlab-ce-632c395e1809715bd3c01e2733a2f8a357136a49.tar.gz | |
Merge branch '49128-improve-log-output-of-jasmine-toequal' into 'master'
Resolve "Improve log output of jasmine `toEqual` diffs"
Closes #49128
See merge request gitlab-org/gitlab-ce!20557
Diffstat (limited to 'yarn.lock')
| -rw-r--r-- | yarn.lock | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/yarn.lock b/yarn.lock index d844ae4f8e9..d478ed84f1b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2522,7 +2522,7 @@ di@^0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c" -diff@^3.4.0: +diff@^3.2.0, diff@^3.4.0: version "3.5.0" resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12" @@ -4554,6 +4554,12 @@ jasmine-core@^2.9.0: version "2.9.0" resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.9.0.tgz#bfbb56defcd30789adec5a3fbba8504233289c72" +jasmine-diff@^0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/jasmine-diff/-/jasmine-diff-0.1.3.tgz#93ccc2dcc41028c5ddd4606558074839f2deeaa8" + dependencies: + diff "^3.2.0" + jasmine-jquery@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/jasmine-jquery/-/jasmine-jquery-2.1.1.tgz#d4095e646944a26763235769ab018d9f30f0d47b" |