diff options
author | Phil Hughes <me@iamphill.com> | 2017-08-07 07:47:30 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-08-07 07:47:30 +0000 |
commit | 03b816f3e845c9b25d3588336fc1616238465deb (patch) | |
tree | 74b0fa57a1674a494e2639ebe81385a8e996dbfa /spec | |
parent | 4b3011e1c20077470ce946d703d98259f88ef268 (diff) | |
parent | d93527805569e9462b5f142d807b14eaaf179876 (diff) | |
download | gitlab-ce-03b816f3e845c9b25d3588336fc1616238465deb.tar.gz |
Merge branch 'fix-pdf-dependencies' into 'master'
Fix issues with pdf-js dependencies
See merge request !13328
Diffstat (limited to 'spec')
-rw-r--r-- | spec/javascripts/pdf/index_spec.js | 4 | ||||
-rw-r--r-- | spec/javascripts/pdf/page_spec.js | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/spec/javascripts/pdf/index_spec.js b/spec/javascripts/pdf/index_spec.js index f661fae5fe2..bebed432f91 100644 --- a/spec/javascripts/pdf/index_spec.js +++ b/spec/javascripts/pdf/index_spec.js @@ -1,8 +1,8 @@ /* eslint-disable import/no-unresolved */ import Vue from 'vue'; -import { PDFJS } from 'pdfjs-dist'; -import workerSrc from 'vendor/pdf.worker'; +import { PDFJS } from 'vendor/pdf'; +import workerSrc from 'vendor/pdf.worker.min'; import PDFLab from '~/pdf/index.vue'; import pdf from '../fixtures/blob/pdf/test.pdf'; diff --git a/spec/javascripts/pdf/page_spec.js b/spec/javascripts/pdf/page_spec.js index ac76ebbfbe6..ac5b21e8f6c 100644 --- a/spec/javascripts/pdf/page_spec.js +++ b/spec/javascripts/pdf/page_spec.js @@ -1,8 +1,8 @@ /* eslint-disable import/no-unresolved */ import Vue from 'vue'; -import pdfjsLib from 'pdfjs-dist'; -import workerSrc from 'vendor/pdf.worker'; +import pdfjsLib from 'vendor/pdf'; +import workerSrc from 'vendor/pdf.worker.min'; import PageComponent from '~/pdf/page/index.vue'; import testPDF from '../fixtures/blob/pdf/test.pdf'; |