diff options
| author | Mike Greiling <mike@pixelcog.com> | 2019-01-07 15:50:58 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2019-01-07 15:50:58 +0000 |
| commit | 97bdac6b60724de58d61701b06dff40159c4eae9 (patch) | |
| tree | be403054045ec13824d06e686067f149b7e68f5d | |
| parent | c24fe9a188d13a26d4e3ae2ff0597e2f867afa47 (diff) | |
| parent | 5b8c806beeeb7561056f90a6a0336be2f207a25e (diff) | |
| download | gitlab-ce-97bdac6b60724de58d61701b06dff40159c4eae9.tar.gz | |
Merge branch 'leipert-dedupe-vue' into 'master'
Update to Vue 2.5.21
Closes #55592
See merge request gitlab-org/gitlab-ce!23969
| -rw-r--r-- | spec/javascripts/ide/components/file_finder/index_spec.js | 1 | ||||
| -rw-r--r-- | yarn.lock | 13 |
2 files changed, 4 insertions, 10 deletions
diff --git a/spec/javascripts/ide/components/file_finder/index_spec.js b/spec/javascripts/ide/components/file_finder/index_spec.js index 4d934f92f72..15ef8c31f91 100644 --- a/spec/javascripts/ide/components/file_finder/index_spec.js +++ b/spec/javascripts/ide/components/file_finder/index_spec.js @@ -56,7 +56,6 @@ describe('IDE File finder item spec', () => { it('renders list of blobs', () => { expect(vm.$el.textContent).toContain('index.js'); - expect(vm.$el.textContent).toContain('component.js'); expect(vm.$el.textContent).not.toContain('folder'); }); diff --git a/yarn.lock b/yarn.lock index 755a14e00e0..1068d4a68ef 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9887,9 +9887,9 @@ vue-style-loader@^4.1.0: loader-utils "^1.0.2" vue-template-compiler@^2.5.0, vue-template-compiler@^2.5.17: - version "2.5.17" - resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.17.tgz#52a4a078c327deb937482a509ae85c06f346c3cb" - integrity sha512-63uI4syCwtGR5IJvZM0LN5tVsahrelomHtCxvRkZPJ/Tf3ADm1U1wG6KWycK3qCfqR+ygM5vewUvmJ0REAYksg== + version "2.5.21" + resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.21.tgz#a57ceb903177e8f643560a8d639a0f8db647054a" + integrity sha512-Vmk5Cv7UcmI99B9nXJEkaK262IQNnHp5rJYo+EwYpe2epTAXqcVyExhV6pk8jTkxQK2vRc8v8KmZBAwdmUZvvw== dependencies: de-indent "^1.0.2" he "^1.1.0" @@ -9904,12 +9904,7 @@ vue-virtual-scroll-list@^1.2.5: resolved "https://registry.yarnpkg.com/vue-virtual-scroll-list/-/vue-virtual-scroll-list-1.2.5.tgz#bcbd010f7cdb035eba8958ebf807c6214d9a167a" integrity sha1-vL0BD3zbA166iVjr+AfGIU2aFno= -vue@^2.5.17: - version "2.5.17" - resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.17.tgz#0f8789ad718be68ca1872629832ed533589c6ada" - integrity sha512-mFbcWoDIJi0w0Za4emyLiW72Jae0yjANHbCVquMKijcavBGypqlF7zHRgMa5k4sesdv7hv2rB4JPdZfR+TPfhQ== - -vue@^2.5.21: +vue@^2.5.17, vue@^2.5.21: version "2.5.21" resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.21.tgz#3d33dcd03bb813912ce894a8303ab553699c4a85" integrity sha512-Aejvyyfhn0zjVeLvXd70h4hrE4zZDx1wfZqia6ekkobLmUZ+vNFQer53B4fu0EjWBSiqApxPejzkO1Znt3joxQ== |