diff options
| author | John Jarvis <jarv@gitlab.com> | 2019-04-02 10:12:32 +0200 |
|---|---|---|
| committer | John Jarvis <jarv@gitlab.com> | 2019-04-02 10:12:32 +0200 |
| commit | 69b65a6b745e74bba290787420a0017395fd7c25 (patch) | |
| tree | c328963cbe5b340c58c88230d21f338c77462ebd /app/assets/javascripts | |
| parent | 1b6fe3ae226e4c6f481c90c886e242fcd96ab11b (diff) | |
| parent | 3e81a5baf25d6ecd9ad807a2b8f4238dcc598d5e (diff) | |
| download | gitlab-ce-69b65a6b745e74bba290787420a0017395fd7c25.tar.gz | |
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into jarv/dev-to-gitlab-2019-04-02jarv/dev-to-gitlab-2019-04-02
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/issue.js | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/pdf/index.vue | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/issue.js b/app/assets/javascripts/issue.js index 94b78907d9a..b3508f36cf9 100644 --- a/app/assets/javascripts/issue.js +++ b/app/assets/javascripts/issue.js @@ -16,7 +16,9 @@ export default class Issue { Issue.createMrDropdownWrap = document.querySelector('.create-mr-dropdown-wrap'); Issue.initMergeRequests(); - Issue.initRelatedBranches(); + if (document.querySelector('#related-branches')) { + Issue.initRelatedBranches(); + } this.closeButtons = $('a.btn-close'); this.reopenButtons = $('a.btn-reopen'); diff --git a/app/assets/javascripts/pdf/index.vue b/app/assets/javascripts/pdf/index.vue index cdf1257b4e3..dc5f9ba9607 100644 --- a/app/assets/javascripts/pdf/index.vue +++ b/app/assets/javascripts/pdf/index.vue @@ -28,7 +28,7 @@ export default { }, watch: { pdf: 'load' }, mounted() { - pdfjsLib.PDFJS.workerSrc = workerSrc; + pdfjsLib.GlobalWorkerOptions.workerSrc = workerSrc; if (this.hasPDF) this.load(); }, methods: { |